annotate src/indent.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29
author cvs
date Mon, 13 Aug 2007 11:13:30 +0200
parents cc15677e0335
children 697ef44129c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Indentation functions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1995 Board of Trustees, University of Illinois.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 /* Synched up with: 19.30. Diverges significantly from FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "insdel.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #ifdef REGION_CACHE_NEEDS_WORK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "region-cache.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
43 Lisp_Object Qcoerce;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
44
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 /* Indentation can insert tabs if this is non-zero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 otherwise always uses spaces */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 int indent_tabs_mode;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 /* Avoid recalculation by remembering things in these variables. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 /* Last value returned by current_column.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 Some things set last_known_column_point to -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 to mark the memoized value as invalid */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 static int last_known_column;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 /* Last buffer searched by current_column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 static struct buffer *last_known_column_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 /* Value of point when current_column was called */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 static Bufpos last_known_column_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 /* Value of MODIFF when current_column was called */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 static int last_known_column_modified;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 last_visible_position (Bufpos pos, struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 Lisp_Object value;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 value = Fprevious_single_property_change (make_int (pos), Qinvisible,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 buffer, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 if (NILP (value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 return 0; /* no visible position found */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 /* #### bug bug bug!!! This will return the position of the beginning
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 of an invisible extent; this extent is very likely to be start-closed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 and thus the spaces inserted in `indent-to' will go inside the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 invisible extent.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 Not sure what the correct solution is here. Rethink indent-to? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 return XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 #ifdef REGION_CACHE_NEEDS_WORK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 /* Allocate or free the width run cache, as requested by the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 state of current_buffer's cache_long_line_scans variable. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 width_run_cache_on_off (struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 if (NILP (buf->cache_long_line_scans))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 /* It should be off. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 if (buf->width_run_cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 free_region_cache (buf->width_run_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 buf->width_run_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 buf->width_table = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 /* It should be on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 if (buf->width_run_cache == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 buf->width_run_cache = new_region_cache ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 recompute_width_table (buf, buffer_display_table ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 #endif /* REGION_CACHE_NEEDS_WORK */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 /* Cancel any recorded value of the horizontal position. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
119
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 invalidate_current_column (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 last_known_column_point = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 int col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 int tab_seen;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 int tab_width = XINT (buf->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 int post_tab;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 Bufpos pos = init_pos;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
134 Emchar c;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 col = tab_seen = post_tab = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 if (pos <= BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 pos--;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
145 c = BUF_FETCH_CHAR (buf, pos);
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
146 if (c == '\t')
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 if (tab_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 col = ((col + tab_width) / tab_width) * tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 post_tab += col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 tab_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 }
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
155 else if (c == '\n' ||
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
156 (EQ (buf->selective_display, Qt) && c == '\r'))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 /* #### This needs updating to handle the new redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 /* #### FSFmacs looks at ctl_arrow, display tables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 We need to do similar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 displayed_glyphs = glyphs_from_bufpos (sel_frame, buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 XWINDOW (selected_window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 pos, dp, 0, col, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 col += (displayed_glyphs->columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 - (displayed_glyphs->begin_columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 + displayed_glyphs->end_columns));
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
170 #else /* XEmacs */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
171 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
172 col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
173 #else
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
174 col ++;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
175 #endif /* MULE */
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
176 #endif /* XEmacs */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 if (tab_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 col = ((col + tab_width) / tab_width) * tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 col += post_tab;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 if (cur_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 last_known_column_buffer = buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 last_known_column = col;
298
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 288
diff changeset
190 last_known_column_point = init_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 last_known_column_modified = BUF_MODIFF (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 return col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 int
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
198 string_column_at_point (Lisp_String* s, Bufpos init_pos, int tab_width)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
199 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
200 int col;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
201 int tab_seen;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
202 int post_tab;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
203 Bufpos pos = init_pos;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
204 Emchar c;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
205
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
206 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
207 col = tab_seen = post_tab = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
208
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
209 while (1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
210 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
211 if (pos <= 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
212 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
213
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
214 pos--;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
215 c = string_char (s, pos);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
216 if (c == '\t')
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
217 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
218 if (tab_seen)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
219 col = ((col + tab_width) / tab_width) * tab_width;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
220
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
221 post_tab += col;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
222 col = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
223 tab_seen = 1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
224 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
225 else if (c == '\n')
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
226 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
227 else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
228 #ifdef MULE
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
229 col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
230 #else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
231 col ++;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
232 #endif /* MULE */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
233 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
234
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
235 if (tab_seen)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
236 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
237 col = ((col + tab_width) / tab_width) * tab_width;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
238 col += post_tab;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
239 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
240
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
241 return col;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
242 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
243
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
244 int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 current_column (struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 if (buf == last_known_column_buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 && BUF_PT (buf) == last_known_column_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 && BUF_MODIFF (buf) == last_known_column_modified)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 return last_known_column;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 return column_at_point (buf, BUF_PT (buf), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
255 DEFUN ("current-column", Fcurrent_column, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 Return the horizontal position of point. Beginning of line is column 0.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 This is calculated by adding together the widths of all the displayed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 representations of the character between the start of the previous line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 and point. (e.g. control characters will have a width of 2 or 4, tabs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 will have a variable width.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 Ignores finite width of frame, which means that this function may return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 values greater than (frame-width).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 Whether the line is visible (if `selective-display' is t) has no effect;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 however, ^M is treated as end of line when `selective-display' is t.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 If BUFFER is nil, the current buffer is assumed.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
266 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
267 (buffer))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
269 return make_int (current_column (decode_buffer (buffer, 0)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
273 DEFUN ("indent-to", Findent_to, 1, 3, "NIndent to column: ", /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 Indent from point with tabs and spaces until COLUMN is reached.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 Optional second argument MIN says always do at least MIN spaces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 even if that goes past COLUMN; by default, MIN is zero.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 If BUFFER is nil, the current buffer is assumed.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
278 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
279 (col, minimum, buffer))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 int mincol;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 int fromcol;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 struct buffer *buf = decode_buffer (buffer, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 int tab_width = XINT (buf->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 Bufpos opoint = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 CHECK_INT (col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 if (NILP (minimum))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 minimum = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 CHECK_INT (minimum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 XSETBUFFER (buffer, buf);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
295
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 fromcol = current_column (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 mincol = fromcol + XINT (minimum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 if (mincol < XINT (col)) mincol = XINT (col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 if (fromcol == mincol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 return make_int (mincol);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
304
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 if (!NILP (Fextent_at (make_int (BUF_PT (buf)), buffer, Qinvisible,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 Qnil, Qnil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 Bufpos last_visible = last_visible_position (BUF_PT (buf), buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 opoint = BUF_PT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 if (last_visible >= BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 BUF_SET_PT (buf, last_visible);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
313 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 error ("Visible portion of buffer not modifiable");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 if (indent_tabs_mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 int n = mincol / tab_width - fromcol / tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 if (n != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 Finsert_char (make_char ('\t'), make_int (n), Qnil, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 fromcol = (mincol / tab_width) * tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 Finsert_char (make_char (' '), make_int (mincol - fromcol), Qnil, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 last_known_column_buffer = buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 last_known_column = mincol;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 last_known_column_point = BUF_PT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 last_known_column_modified = BUF_MODIFF (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 /* Not in FSF: */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 if (opoint > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 BUF_SET_PT (buf, opoint);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
339 return make_int (mincol);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 bi_spaces_at_point (struct buffer *b, Bytind bi_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 Bytind bi_end = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 int col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 Emchar c;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 int tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 if (tab_width <= 0 || tab_width > 1000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 while (bi_pos < bi_end &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 (c = BI_BUF_FETCH_CHAR (b, bi_pos),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 (c == '\t'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 ? (col += tab_width - col % tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 : (c == ' ' ? ++col : 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 INC_BYTIND (b, bi_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 return col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
364 DEFUN ("current-indentation", Fcurrent_indentation, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 Return the indentation of the current line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 This is the horizontal position of the character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 following any initial whitespace.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
368 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
369 (buffer))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 struct buffer *buf = decode_buffer (buffer, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 Bufpos pos = find_next_newline (buf, BUF_PT (buf), -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 return Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 return make_int (bi_spaces_at_point (buf, bufpos_to_bytind (buf, pos)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
383 DEFUN ("move-to-column", Fmove_to_column, 1, 3, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 Move point to column COLUMN in the current line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 The column of a character is calculated by adding together the widths
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 as displayed of the previous characters in the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 This function ignores line-continuation;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 there is no upper limit on the column number a character can have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 and horizontal scrolling has no effect.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 If specified column is within a character, point goes after that character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 If it's past end of line, point goes to end of line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
394 A value of 'coerce for the second (optional) argument FORCE means if
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
395 COLUMN is in the middle of a tab character, change it to spaces.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
396 Any other non-nil value means the same, plus if the line is too short to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
397 reach column COLUMN, then add spaces/tabs to get there.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
398
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 Returns the actual column that it moved to.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
400 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
401 (column, force, buffer))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 struct buffer *buf = decode_buffer (buffer, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 int col = current_column (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 int goal;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 Bufpos end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 int tab_width = XINT (buf->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 int prev_col = 0;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
412 Emchar c = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 CHECK_NATNUM (column);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 goal = XINT (column);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 retry:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 pos = BUF_PT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 end = BUF_ZV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 /* If we're starting past the desired column,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 back up to beginning of line and scan from there. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 if (col > goal)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 pos = find_next_newline (buf, pos, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 while (col < goal && pos < end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 c = BUF_FETCH_CHAR (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 if (c == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 if (c == '\r' && EQ (buf->selective_display, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 if (c == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 prev_col = col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 col += tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 col = col / tab_width * tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 /* #### oh for the days of the complete new redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 /* #### FSFmacs looks at ctl_arrow, display tables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 We need to do similar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 displayed_glyphs = glyphs_from_bufpos (selected_frame (),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 XWINDOW (Fselected_window (Qnil)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 pos, dp, 0, col, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 col += (displayed_glyphs->columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 - (displayed_glyphs->begin_columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 + displayed_glyphs->end_columns));
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
457 #else /* XEmacs */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
458 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
459 col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
460 #else
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
461 col ++;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 20
diff changeset
462 #endif /* MULE */
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
463 #endif /* XEmacs */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 BUF_SET_PT (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 /* If a tab char made us overshoot, change it to spaces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 and scan through it again. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 buffer_delete_range (buf, BUF_PT (buf) - 1, BUF_PT (buf), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 Findent_to (make_int (col - 1), Qzero, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 buffer_insert_emacs_char (buf, ' ');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 goto retry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 /* If line ends prematurely, add space to the end. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
482 if (col < goal && !NILP (force) && !EQ (force, Qcoerce))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 col = goal;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 Findent_to (make_int (col), Qzero, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 last_known_column_buffer = buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 last_known_column = col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 last_known_column_point = BUF_PT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 last_known_column_modified = BUF_MODIFF (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 70
diff changeset
493 return make_int (col);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 #if 0 /* #### OK boys, this function needs to be present, I think.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 It was there before the 19.12 redisplay rewrite. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 70
diff changeset
499 xxDEFUN ("compute-motion", Fcompute_motion, 7, 7, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 "Scan through the current buffer, calculating screen position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 Scan the current buffer forward from offset FROM,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 and return the ending buffer position and screen location.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 There are three additional arguments:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 WIDTH is the number of columns available to display text;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 this affects handling of continuation lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 This is usually the value returned by `window-width', less one (to allow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 for the continuation glyph).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 HSCROLL is the number of columns not being displayed at the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 margin; this is usually taken from a window's hscroll member.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 TAB-OFFSET is the number of columns of the first tab that aren't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 being displayed, perhaps because the line was continued within it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 WINDOW is the window to operate on. Currently this is used only to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 find the display table. It does not matter what buffer WINDOW displays;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 `compute-motion' always operates on the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 The value is a list of five elements:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (POS HPOS VPOS PREVHPOS CONTIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 POS is the buffer position where the scan stopped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 VPOS is the vertical position where the scan stopped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 HPOS is the horizontal position where the scan stopped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 PREVHPOS is the horizontal position one character back from POS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 CONTIN is t if a line was continued after (or within) the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 For example, to find the buffer position of column COL of line LINE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 of a certain window, pass the window's starting location as FROM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 and the window's upper-left coordinates as FROMPOS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 Pass the buffer's (point-max) as TO, to limit the scan to the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 visible section of the buffer, and pass LINE and COL as TOPOS.
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 70
diff changeset
538 */
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 70
diff changeset
539 (from, frompos, to, topos, width, offsets, window))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 Lisp_Object bufpos, hpos, vpos, prevhpos, contin;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 struct position *pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 int hscroll, tab_offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 struct window *w = decode_window (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 CHECK_INT_COERCE_MARKER (from);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 CHECK_CONS (frompos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 CHECK_INT (XCAR (frompos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 CHECK_INT (XCDR (frompos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 CHECK_INT_COERCE_MARKER (to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 CHECK_CONS (topos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 CHECK_INT (XCAR (topos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 CHECK_INT (XCDR (topos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 CHECK_INT (width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 if (!NILP (offsets))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 CHECK_CONS (offsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 CHECK_INT (XCAR (offsets));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 CHECK_INT (XCDR (offsets));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 hscroll = XINT (XCAR (offsets));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 tab_offset = XINT (XCDR (offsets));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 hscroll = tab_offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 pos = compute_motion (XINT (from), XINT (XCDR (frompos)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 XINT (XCAR (frompos)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 XINT (to), XINT (XCDR (topos)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 XINT (XCAR (topos)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 XINT (width), hscroll, tab_offset, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 XSETINT (bufpos, pos->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 XSETINT (hpos, pos->hpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 XSETINT (vpos, pos->vpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 XSETINT (prevhpos, pos->prevhpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 70
diff changeset
577 return list5 (bufpos, hpos, vpos, prevhpos,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 pos->contin ? Qt : Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 #endif /* 0 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
583 /* Helper for vmotion_1 - compute vertical pixel motion between
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
584 START and END in the line start cache CACHE. This just sums
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
585 the line heights, including both the starting and ending lines.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
586 */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
587 static int
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
588 vpix_motion (line_start_cache_dynarr *cache, int start, int end)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
589 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
590 int i, vpix;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
591
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
592 assert (start <= end);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
593 assert (start >= 0);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
594 assert (end < Dynarr_length (cache));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
595
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
596 vpix = 0;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
597 for (i = start; i <= end; i++)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
598 vpix += Dynarr_atp (cache, i)->height;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
599
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
600 return vpix;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
601 }
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
602
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 /*****************************************************************************
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
604 vmotion_1
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 Given a starting position ORIG, move point VTARGET lines in WINDOW.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 Returns the new value for point. If the arg ret_vpos is not nil, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 taken to be a pointer to an int and the number of lines actually moved is
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
609 returned in it. If the arg ret_vpix is not nil, it is taken to be a
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
610 pointer to an int and the vertical pixel height of the motion which
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
611 took place is returned in it.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 ****************************************************************************/
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
613 static Bufpos
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
614 vmotion_1 (struct window *w, Bufpos orig, int vtarget,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
615 int *ret_vpos, int *ret_vpix)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 elt = point_in_line_start_cache (w, orig, (vtarget < 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 ? -vtarget
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 : vtarget));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 /* #### This assertion must be true before the if statements are hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 but may possibly be wrong after the call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 point_in_line_start_cache if orig is outside of the visible
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 361
diff changeset
627 region of the buffer. Handle this. */
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 361
diff changeset
628 assert (elt >= 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 /* Moving downward. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 if (vtarget > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 int cur_line = Dynarr_length (w->line_start_cache) - 1 - elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 Bufpos ret_pt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 if (cur_line > vtarget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 cur_line = vtarget;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 /* The traditional FSF behavior is to return the end of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 position if we couldn't move far enough because we hit it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 if (cur_line < vtarget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 ret_pt = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 while (ret_pt > BUF_ZV (b) && cur_line > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 cur_line--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 if (ret_vpos) *ret_vpos = cur_line;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
653 if (ret_vpix)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
654 *ret_vpix = vpix_motion (w->line_start_cache, elt, cur_line + elt);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
655 return ret_pt;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 else if (vtarget < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 if (elt < -vtarget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 if (ret_vpos) *ret_vpos = -elt;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
662 if (ret_vpix)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
663 *ret_vpix = vpix_motion (w->line_start_cache, 0, elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 /* #### This should be BUF_BEGV (b), right? */
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
665 return Dynarr_atp (w->line_start_cache, 0)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 if (ret_vpos) *ret_vpos = vtarget;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
670 if (ret_vpix)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
671 *ret_vpix = vpix_motion (w->line_start_cache, elt + vtarget, elt);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
672 return Dynarr_atp (w->line_start_cache, elt + vtarget)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 /* No vertical motion requested so we just return the position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 of the beginning of the current line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 if (ret_vpos) *ret_vpos = 0;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
680 if (ret_vpix)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
681 *ret_vpix = vpix_motion (w->line_start_cache, elt, elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 149
diff changeset
683 return Dynarr_atp (w->line_start_cache, elt)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 RETURN_NOT_REACHED(0) /* shut up compiler */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
689 /*****************************************************************************
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
690 vmotion
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
691
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
692 Given a starting position ORIG, move point VTARGET lines in WINDOW.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
693 Returns the new value for point. If the arg ret_vpos is not nil, it is
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
694 taken to be a pointer to an int and the number of lines actually moved is
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
695 returned in it.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
696 ****************************************************************************/
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
697 Bufpos
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
698 vmotion (struct window *w, Bufpos orig, int vtarget, int *ret_vpos)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
699 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
700 return vmotion_1 (w, orig, vtarget, ret_vpos, NULL);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
701 }
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
702
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
703 /* Helper for Fvertical_motion.
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
704 */
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
705 static
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
706 Lisp_Object vertical_motion_1 (Lisp_Object lines, Lisp_Object window,
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
707 int pixels)
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
708 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
709 Bufpos bufpos;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
710 Bufpos orig;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
711 int selected;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
712 int *vpos, *vpix;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
713 int value=0;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
714 struct window *w;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
715
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
716 if (NILP (window))
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
717 window = Fselected_window (Qnil);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
718
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
719 CHECK_LIVE_WINDOW (window);
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
720 CHECK_INT (lines);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
721
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
722 selected = (EQ (window, Fselected_window (Qnil)));
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
723
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
724 w = XWINDOW (window);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
725
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
726 orig = selected ? BUF_PT (XBUFFER (w->buffer))
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
727 : marker_position (w->pointm[CURRENT_DISP]);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
728
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
729 vpos = pixels ? NULL : &value;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
730 vpix = pixels ? &value : NULL;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
731
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
732 bufpos = vmotion_1 (w, orig, XINT (lines), vpos, vpix);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
733
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
734 /* Note that the buffer's point is set, not the window's point. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
735 if (selected)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
736 BUF_SET_PT (XBUFFER (w->buffer), bufpos);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
737 else
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
738 set_marker_restricted (w->pointm[CURRENT_DISP],
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
739 make_int(bufpos),
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
740 w->buffer);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
741
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
742 return make_int (value);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
743 }
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
744
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
745 DEFUN ("vertical-motion", Fvertical_motion, 1, 3, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 Move to start of frame line LINES lines down.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 If LINES is negative, this is moving up.
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
748 Optional second argument is WINDOW to move in,
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
749 the default is the selected window.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
751 Sets point to position found; this may be start of line
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
752 or just the start of a continuation line.
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
753 If optional third argument PIXELS is nil, returns number
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
754 of lines moved; may be closer to zero than LINES if beginning
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
755 or end of buffer was reached. If PIXELS is non-nil, the
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
756 vertical pixel height of the motion which took place is
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
757 returned instead of the actual number of lines moved. A
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
758 motion of zero lines returns the height of the current line.
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
759
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 Note that `vertical-motion' sets WINDOW's buffer's point, not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 WINDOW's point. (This differs from FSF Emacs, which buggily always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 sets current buffer's point, regardless of WINDOW.)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
763 */
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
764 (lines, window, pixels))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 {
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
766 return vertical_motion_1 (lines, window, !NILP (pixels));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
769 /*
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
770 * Like vmotion() but requested and returned movement is in pixels.
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
771 * HOW specifies the stopping condition. Positive means move at least
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
772 * PIXELS. Negative means at most. Zero means as close as possible.
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
773 */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
774 Bufpos
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
775 vmotion_pixels (Lisp_Object window, Bufpos start, int pixels, int how,
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
776 int *motion)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
777 {
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
778 struct window *w;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
779 Bufpos eobuf, bobuf;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
780 int defheight;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
781 int needed;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
782 int line, next;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
783 int remain, abspix, dirn;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
784 int elt, nelt;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
785 int i;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
786 line_start_cache_dynarr *cache;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
787 int previous = -1;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
788 int lines;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
789
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
790 if (NILP (window))
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
791 window = Fselected_window (Qnil);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
792
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
793 CHECK_LIVE_WINDOW (window);
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
794 w = XWINDOW (window);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
795
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
796 eobuf = BUF_ZV (XBUFFER (w->buffer));
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
797 bobuf = BUF_BEGV (XBUFFER (w->buffer));
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
798
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
799 default_face_height_and_width (window, &defheight, NULL);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
800
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
801 /* guess num lines needed in line start cache + a few extra */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
802 abspix = abs (pixels);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
803 needed = (abspix + defheight-1)/defheight + 3;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
804
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
805 dirn = (pixels >= 0) ? 1 : -1;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
806
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
807 while (1)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
808 {
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
809 elt = point_in_line_start_cache (w, start, needed);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
810 assert (elt >= 0); /* in the cache */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
811
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
812 cache = w->line_start_cache;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
813 nelt = Dynarr_length (cache);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
814
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
815 *motion = 0;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
816
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
817 if (pixels == 0)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
818 /* No vertical motion requested so we just return the position
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
819 of the beginning of the current display line. */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
820 return Dynarr_atp (cache, elt)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
821
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
822 if ((dirn < 0 && elt == 0 &&
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
823 Dynarr_atp (cache, elt)->start <= bobuf) ||
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
824 (dirn > 0 && elt == nelt-1 &&
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
825 Dynarr_atp (cache, elt)->end >= eobuf))
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
826 return Dynarr_atp (cache, elt)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
827
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
828 remain = abspix;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
829 for (i = elt; (dirn > 0) ? (i < nelt) : (i > 0); i += dirn)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
830 {
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
831 /* cache line we're considering moving over */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
832 int ii = (dirn > 0) ? i : i-1;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
833
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
834 if (remain < 0)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
835 return Dynarr_atp (cache, i)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
836
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
837 line = Dynarr_atp (cache, ii)->height;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
838 next = remain - line;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
839
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
840 /* is stopping condition satisfied? */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
841 if ((how > 0 && remain <= 0) || /* at least */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
842 (how < 0 && next < 0) || /* at most */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
843 (how == 0 && remain <= abs (next))) /* closest */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
844 return Dynarr_atp (cache, i)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
845
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
846 /* moving down and nowhere left to go? */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
847 if (dirn > 0 && Dynarr_atp (cache, ii)->end >= eobuf)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
848 return Dynarr_atp (cache, ii)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
849
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
850 /* take the step */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
851 remain = next;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
852 *motion += dirn * line;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
853
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
854 /* moving up and nowhere left to go? */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
855 if (dirn < 0 && Dynarr_atp (cache, ii)->start <= bobuf)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
856 return Dynarr_atp (cache, ii)->start;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
857 }
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
858
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
859 /* get here => need more cache lines. try again. */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
860 assert (abs (*motion) > previous); /* progress? */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
861 previous = abs (*motion);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
862
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
863 lines = (pixels < 0) ? elt : (nelt - elt);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
864 needed += (remain*lines + abspix-1)/abspix + 3;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
865 }
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
866
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
867 RETURN_NOT_REACHED(0) /* shut up compiler */
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
868 }
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
869
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
870 DEFUN ("vertical-motion-pixels", Fvertical_motion_pixels, 1, 3, 0, /*
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
871 Move to start of frame line PIXELS vertical pixels down.
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
872 If PIXELS is negative, this is moving up.
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
873 The actual vertical motion in pixels is returned.
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
874
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
875 Optional second argument is WINDOW to move in,
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
876 the default is the selected window.
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
877
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
878 Optional third argument HOW specifies when to stop. A value
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
879 less than zero indicates that the motion should be no more
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
880 than PIXELS. A value greater than zero indicates that the
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
881 motion should be at least PIXELS. Any other value indicates
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
882 that the motion should be as close as possible to PIXELS.
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
883 */
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
884 (pixels, window, how))
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
885 {
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
886 Bufpos bufpos;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
887 Bufpos orig;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
888 int selected;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
889 int motion;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
890 int howto;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
891 struct window *w;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
892
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
893 if (NILP (window))
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
894 window = Fselected_window (Qnil);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
895
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
896 CHECK_LIVE_WINDOW (window);
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
897 CHECK_INT (pixels);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
898
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
899 selected = (EQ (window, Fselected_window (Qnil)));
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
900
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
901 w = XWINDOW (window);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
902
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
903 orig = selected ? BUF_PT (XBUFFER (w->buffer))
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
904 : marker_position (w->pointm[CURRENT_DISP]);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
905
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
906 howto = INTP (how) ? XINT (how) : 0;
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
907
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
908 bufpos = vmotion_pixels (window, orig, XINT (pixels), howto, &motion);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
909
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
910 if (selected)
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
911 BUF_SET_PT (XBUFFER (w->buffer), bufpos);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
912 else
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
913 set_marker_restricted (w->pointm[CURRENT_DISP],
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
914 make_int(bufpos),
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
915 w->buffer);
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
916
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 276
diff changeset
917 return make_int (motion);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
918 }
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
919
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 syms_of_indent (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 {
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
924 DEFSUBR (Fcurrent_indentation);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
925 DEFSUBR (Findent_to);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
926 DEFSUBR (Fcurrent_column);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
927 DEFSUBR (Fmove_to_column);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 #if 0 /* #### */
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
929 DEFSUBR (Fcompute_motion);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 #endif
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
931 DEFSUBR (Fvertical_motion);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 185
diff changeset
932 DEFSUBR (Fvertical_motion_pixels);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
933
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 371
diff changeset
934 defsymbol (&Qcoerce, "coerce");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 vars_of_indent (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 *Indentation can insert tabs if this is non-nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 Setting this variable automatically makes it local to the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 indent_tabs_mode = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 }