annotate src/indent.c @ 75652:bd6d4488b990

(Fmove_to_column): Document that the argument COLUMN is taken from prefix numeric argument.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 03 Feb 2007 21:54:54 +0000
parents 3d45362f1d38
children 0ce9492fa779 07774e5c3ff5 52a7f3f50b89
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Indentation functions.
59710
dc40d9822125 (Fcurrent_column): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59647
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
75348
3d45362f1d38 Add 2007 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 75105
diff changeset
3 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
12244
ac7375e60931 Update GPL to version 2.
Karl Heuer <kwzh@gnu.org>
parents: 12090
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
64084
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61863
diff changeset
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61863
diff changeset
20 Boston, MA 02110-1301, USA. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4385
diff changeset
22 #include <config.h>
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include "lisp.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "buffer.h"
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
25 #include "charset.h"
20256
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
26 #include "category.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "indent.h"
31102
6a0caa788013 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 29405
diff changeset
28 #include "keyboard.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
29 #include "frame.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "window.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "termchar.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "termopts.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "disptab.h"
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
34 #include "intervals.h"
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
35 #include "region-cache.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 /* Indentation can insert tabs if this is non-zero;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
38 otherwise always uses spaces. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
39
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 int indent_tabs_mode;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 #define CR 015
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43
39904
1a3d4895f3cf Fix a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 39863
diff changeset
44 /* These three values memorize the current column to avoid recalculation. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
45
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
46 /* Last value returned by current_column.
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
47 Some things in set last_known_column_point to -1
39904
1a3d4895f3cf Fix a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 39863
diff changeset
48 to mark the memorized value as invalid. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
49
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
50 double last_known_column;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
51
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
52 /* Value of point when current_column was called. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
53
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 int last_known_column_point;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
55
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
56 /* Value of MODIFF when current_column was called. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
57
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 int last_known_column_modified;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
60 static double current_column_1 P_ ((void));
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
61 static double position_indentation P_ ((int));
15494
a544bb3eea53 (current_column_1): Add declaration.
Richard M. Stallman <rms@gnu.org>
parents: 15493
diff changeset
62
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
63 /* Cache of beginning of line found by the last call of
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
64 current_column. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
65
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
66 int current_column_bol_cache;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
67
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68 /* Get the display table to use for the current buffer. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
69
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
70 struct Lisp_Char_Table *
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71 buffer_display_table ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
73 Lisp_Object thisbuf;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75 thisbuf = current_buffer->display_table;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
76 if (DISP_TABLE_P (thisbuf))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
77 return XCHAR_TABLE (thisbuf);
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
78 if (DISP_TABLE_P (Vstandard_display_table))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
79 return XCHAR_TABLE (Vstandard_display_table);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80 return 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
83 /* Width run cache considerations. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
84
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
85 /* Return the width of character C under display table DP. */
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
86
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
87 static int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
88 character_width (c, dp)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
89 int c;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
90 struct Lisp_Char_Table *dp;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
91 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
92 Lisp_Object elt;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
93
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
94 /* These width computations were determined by examining the cases
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
95 in display_text_line. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
96
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
97 /* Everything can be handled by the display table, if it's
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
98 present and the element is right. */
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
99 if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
100 return XVECTOR (elt)->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
101
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
102 /* Some characters are special. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
103 if (c == '\n' || c == '\t' || c == '\015')
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
104 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
105
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
106 /* Printing characters have width 1. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
107 else if (c >= 040 && c < 0177)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
108 return 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
109
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
110 /* Everybody else (control characters, metacharacters) has other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
111 widths. We could return their actual widths here, but they
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
112 depend on things like ctl_arrow and crud like that, and they're
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
113 not very common at all. So we'll just claim we don't know their
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
114 widths. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
115 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
116 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
117 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
118
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
119 /* Return true iff the display table DISPTAB specifies the same widths
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
120 for characters as WIDTHTAB. We use this to decide when to
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
121 invalidate the buffer's width_run_cache. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
122
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
123 int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
124 disptab_matches_widthtab (disptab, widthtab)
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
125 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
126 struct Lisp_Vector *widthtab;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
127 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
128 int i;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
129
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
130 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
131 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
132
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
133 for (i = 0; i < 256; i++)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
134 if (character_width (i, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
135 != XFASTINT (widthtab->contents[i]))
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
136 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
137
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
138 return 1;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
139 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
140
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
141 /* Recompute BUF's width table, using the display table DISPTAB. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
142
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
143 void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
144 recompute_width_table (buf, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
145 struct buffer *buf;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
146 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
147 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
148 int i;
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
149 struct Lisp_Vector *widthtab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
150
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
151 if (!VECTORP (buf->width_table))
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
152 buf->width_table = Fmake_vector (make_number (256), make_number (0));
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
153 widthtab = XVECTOR (buf->width_table);
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
154 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
155 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
156
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
157 for (i = 0; i < 256; i++)
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
158 XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
159 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
160
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
161 /* Allocate or free the width run cache, as requested by the current
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
162 state of current_buffer's cache_long_line_scans variable. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
163
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
164 static void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
165 width_run_cache_on_off ()
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
166 {
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
167 if (NILP (current_buffer->cache_long_line_scans)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
168 /* And, for the moment, this feature doesn't work on multibyte
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
169 characters. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
170 || !NILP (current_buffer->enable_multibyte_characters))
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
171 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
172 /* It should be off. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
173 if (current_buffer->width_run_cache)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
174 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
175 free_region_cache (current_buffer->width_run_cache);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
176 current_buffer->width_run_cache = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
177 current_buffer->width_table = Qnil;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
178 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
179 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
180 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
181 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
182 /* It should be on. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
183 if (current_buffer->width_run_cache == 0)
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
184 {
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
185 current_buffer->width_run_cache = new_region_cache ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
186 recompute_width_table (current_buffer, buffer_display_table ());
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
187 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
188 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
189 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
190
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
191
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
192 /* Skip some invisible characters starting from POS.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
193 This includes characters invisible because of text properties
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
194 and characters invisible because of overlays.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
195
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
196 If position POS is followed by invisible characters,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
197 skip some of them and return the position after them.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
198 Otherwise return POS itself.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
199
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
200 Set *NEXT_BOUNDARY_P to the next position at which
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
201 it will be necessary to call this function again.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
202
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
203 Don't scan past TO, and don't set *NEXT_BOUNDARY_P
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
204 to a value greater than TO.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
205
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
206 If WINDOW is non-nil, and this buffer is displayed in WINDOW,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
207 take account of overlays that apply only in WINDOW.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
208
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
209 We don't necessarily skip all the invisible characters after POS
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
210 because that could take a long time. We skip a reasonable number
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
211 which can be skipped quickly. If there might be more invisible
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
212 characters immediately following, then *NEXT_BOUNDARY_P
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
213 will equal the return value. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
214
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
215 int
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
216 skip_invisible (pos, next_boundary_p, to, window)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
217 int pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
218 int *next_boundary_p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
219 int to;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
220 Lisp_Object window;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
221 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18109
diff changeset
222 Lisp_Object prop, position, overlay_limit, proplimit;
58451
4fcc66cf0b9c (skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58396
diff changeset
223 Lisp_Object buffer, tmp;
43735
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
224 int end, inv_p;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
225
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
226 XSETFASTINT (position, pos);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
227 XSETBUFFER (buffer, current_buffer);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
228
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
229 /* Give faster response for overlay lookup near POS. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
230 recenter_overlay_lists (current_buffer, pos);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
231
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
232 /* We must not advance farther than the next overlay change.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
233 The overlay change might change the invisible property;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
234 or there might be overlay strings to be displayed there. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
235 overlay_limit = Fnext_overlay_change (position);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
236 /* As for text properties, this gives a lower bound
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
237 for where the invisible text property could change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
238 proplimit = Fnext_property_change (position, buffer, Qt);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
239 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
240 proplimit = overlay_limit;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
241 /* PROPLIMIT is now a lower bound for the next change
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
242 in invisible status. If that is plenty far away,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
243 use that lower bound. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
244 if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
245 *next_boundary_p = XFASTINT (proplimit);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
246 /* Otherwise, scan for the next `invisible' property change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
247 else
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
248 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
249 /* Don't scan terribly far. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
250 XSETFASTINT (proplimit, min (pos + 100, to));
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
251 /* No matter what. don't go past next overlay change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
252 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
253 proplimit = overlay_limit;
58451
4fcc66cf0b9c (skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58396
diff changeset
254 tmp = Fnext_single_property_change (position, Qinvisible,
4fcc66cf0b9c (skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58396
diff changeset
255 buffer, proplimit);
4fcc66cf0b9c (skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58396
diff changeset
256 end = XFASTINT (tmp);
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
257 #if 0
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
258 /* Don't put the boundary in the middle of multibyte form if
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
259 there is no actual property change. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
260 if (end == pos + 100
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
261 && !NILP (current_buffer->enable_multibyte_characters)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
262 && end < ZV)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
263 while (pos < end && !CHAR_HEAD_P (POS_ADDR (end)))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
264 end--;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
265 #endif
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18109
diff changeset
266 *next_boundary_p = end;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
267 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
268 /* if the `invisible' property is set, we can skip to
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
269 the next property change */
43735
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
270 prop = Fget_char_property (position, Qinvisible,
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
271 (!NILP (window)
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
272 && EQ (XWINDOW (window)->buffer, buffer))
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
273 ? window : buffer);
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
274 inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
275 /* When counting columns (window == nil), don't skip over ellipsis text. */
30053d20015f (skip_invisible): Fix my brain fart.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41900
diff changeset
276 if (NILP (window) ? inv_p == 1 : inv_p)
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
277 return *next_boundary_p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
278 return pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
279 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
280
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
281 /* If a composition starts at POS/POS_BYTE and it doesn't stride over
29405
b32f6068a250 Fix nested comment.
Dave Love <fx@gnu.org>
parents: 28933
diff changeset
282 POINT, set *LEN / *LEN_BYTE to the character and byte lengths, *WIDTH
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
283 to the width, and return 1. Otherwise, return 0. */
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
284
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
285 static int
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
286 check_composition (pos, pos_byte, point, len, len_byte, width)
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
287 int pos, pos_byte, point;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
288 int *len, *len_byte, *width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
289 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
290 Lisp_Object prop;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
291 int start, end;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
292 int id;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
293
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
294 if (! find_composition (pos, -1, &start, &end, &prop, Qnil)
35405
d11cb64840ee (check_composition): Check validity of composition.
Kenichi Handa <handa@m17n.org>
parents: 34967
diff changeset
295 || pos != start || point < end
d11cb64840ee (check_composition): Check validity of composition.
Kenichi Handa <handa@m17n.org>
parents: 34967
diff changeset
296 || !COMPOSITION_VALID_P (start, end, prop))
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
297 return 0;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
298 if ((id = get_composition_id (pos, pos_byte, end - pos, prop, Qnil)) < 0)
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
299 return 0;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
300
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
301 *len = COMPOSITION_LENGTH (prop);
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
302 *len_byte = CHAR_TO_BYTE (end) - pos_byte;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
303 *width = composition_table[id]->width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
304 return 1;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
305 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
306
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
307 /* Set variables WIDTH and BYTES for a multibyte sequence starting at P.
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
308
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
309 DP is a display table or NULL.
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
310
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
311 This macro is used in current_column_1, Fmove_to_column, and
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
312 compute_motion. */
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
313
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
314 #define MULTIBYTE_BYTES_WIDTH(p, dp) \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
315 do { \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
316 int c; \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
317 \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
318 wide_column = 0; \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
319 c = STRING_CHAR_AND_LENGTH (p, MAX_MULTIBYTE_LENGTH, bytes); \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
320 if (BYTES_BY_CHAR_HEAD (*p) != bytes) \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
321 width = bytes * 4; \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
322 else \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
323 { \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
324 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
325 width = XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
326 else \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
327 width = WIDTH_BY_CHAR_HEAD (*p); \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
328 if (width > 1) \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
329 wide_column = width; \
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
330 } \
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
331 } while (0)
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
332
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
333
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
335 doc: /* Return the horizontal position of point. Beginning of line is column 0.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
336 This is calculated by adding together the widths of all the displayed
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
337 representations of the character between the start of the previous line
72885
0e86882b32a9 (Fcurrent_column, Findent_to): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 72575
diff changeset
338 and point (eg. control characters will have a width of 2 or 4, tabs
0e86882b32a9 (Fcurrent_column, Findent_to): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 72575
diff changeset
339 will have a variable width).
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
340 Ignores finite width of frame, which means that this function may return
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
341 values greater than (frame-width).
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
342 Whether the line is visible (if `selective-display' is t) has no effect;
59710
dc40d9822125 (Fcurrent_column): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59647
diff changeset
343 however, ^M is treated as end of line when `selective-display' is t.
dc40d9822125 (Fcurrent_column): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59647
diff changeset
344 Text that has an invisible property is considered as having width 0, unless
dc40d9822125 (Fcurrent_column): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59647
diff changeset
345 `buffer-invisibility-spec' specifies that it is replaced by an ellipsis. */)
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
346 ()
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
347 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
348 Lisp_Object temp;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
349 XSETFASTINT (temp, (int) current_column ()); /* iftc */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 return temp;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352
327
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
353 /* Cancel any recorded value of the horizontal position. */
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
354
20371
976eed15d6b5 (invalidate_current_column): Declare it as void.
Kenichi Handa <handa@m17n.org>
parents: 20256
diff changeset
355 void
327
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
356 invalidate_current_column ()
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
357 {
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
358 last_known_column_point = 0;
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
359 }
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
360
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
361 double
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 current_column ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 register int col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 register unsigned char *ptr, *stop;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 register int tab_seen;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367 int post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 register int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
370 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
371 register struct Lisp_Char_Table *dp = buffer_display_table ();
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
373 if (PT == last_known_column_point
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 && MODIFF == last_known_column_modified)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375 return last_known_column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
377 /* If the buffer has overlays, text properties,
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
378 or multibyte characters, use a more general algorithm. */
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
379 if (BUF_INTERVALS (current_buffer)
51838
d0e8a670d28d (current_column): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51206
diff changeset
380 || current_buffer->overlays_before
d0e8a670d28d (current_column): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51206
diff changeset
381 || current_buffer->overlays_after
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
382 || Z != Z_BYTE)
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
383 return current_column_1 ();
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
384
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
385 /* Scan backwards from point to the previous newline,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
386 counting width. Tab characters are the only complicated case. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
387
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388 /* Make a pointer for decrementing through the chars before point. */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
389 ptr = BYTE_POS_ADDR (PT_BYTE - 1) + 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390 /* Make a pointer to where consecutive chars leave off,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
391 going backwards from point. */
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
392 if (PT == BEGV)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 stop = ptr;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
394 else if (PT <= GPT || BEGV > GPT)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 stop = GAP_END_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
399 if (tab_width <= 0 || tab_width > 1000)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
400 tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 col = 0, tab_seen = 0, post_tab = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
406 EMACS_INT i, n;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
407 Lisp_Object charvec;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
408
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
409 if (ptr == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
411 /* We stopped either for the beginning of the buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 or for the gap. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413 if (ptr == BEGV_ADDR)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414 break;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
415
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 /* It was the gap. Jump back over it. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418 ptr = GPT_ADDR;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
419
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
420 /* Check whether that brings us to beginning of buffer. */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
421 if (BEGV >= GPT)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
422 break;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 c = *--ptr;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
426
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
427 if (dp && VECTORP (DISP_CHAR_VECTOR (dp, c)))
19208
1d24f0a03f75 (current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents: 19080
diff changeset
428 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
429 charvec = DISP_CHAR_VECTOR (dp, c);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
430 n = ASIZE (charvec);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
431 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 else
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
433 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
434 charvec = Qnil;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
435 n = 1;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
436 }
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
437
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
438 for (i = n - 1; i >= 0; --i)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
439 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
440 if (VECTORP (charvec))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
441 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
442 /* This should be handled the same as
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
443 next_element_from_display_vector does it. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
444 Lisp_Object entry = AREF (charvec, i);
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
445
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
446 if (INTEGERP (entry)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
447 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
448 c = FAST_GLYPH_CHAR (XFASTINT (entry));
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
449 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
450 c = ' ';
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
451 }
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
452
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
453 if (c >= 040 && c < 0177)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
454 col++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
455 else if (c == '\n'
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
456 || (c == '\r'
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
457 && EQ (current_buffer->selective_display, Qt)))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
458 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
459 ptr++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
460 goto start_of_line_found;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
461 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
462 else if (c == '\t')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
463 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
464 if (tab_seen)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
465 col = ((col + tab_width) / tab_width) * tab_width;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
466
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
467 post_tab += col;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
468 col = 0;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
469 tab_seen = 1;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
470 }
38530
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
471 else if (VECTORP (charvec))
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
472 /* With a display table entry, C is displayed as is, and
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
473 not displayed as \NNN or as ^N. If C is a single-byte
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
474 character, it takes one column. If C is multi-byte in
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
475 an unibyte buffer, it's translated to unibyte, so it
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
476 also takes one column. */
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
477 ++col;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
478 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
479 col += (ctl_arrow && c < 0200) ? 2 : 4;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
480 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
481 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
483 start_of_line_found:
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
484
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 if (tab_seen)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 col = ((col + tab_width) / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 col += post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
489 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
491 if (ptr == BEGV_ADDR)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
492 current_column_bol_cache = BEGV;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
493 else
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
494 current_column_bol_cache = BYTE_TO_CHAR (PTR_BYTE_POS (ptr));
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
495
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
497 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 return col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
503 /* Return the column number of position POS
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
504 by scanning forward from the beginning of the line.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
505 This function handles characters that are invisible
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
506 due to text properties or overlays. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
507
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
508 static double
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
509 current_column_1 ()
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
510 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
511 register int tab_width = XINT (current_buffer->tab_width);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
512 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
513 register struct Lisp_Char_Table *dp = buffer_display_table ();
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
514 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
515
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
516 /* Start the scan at the beginning of this line with column number 0. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
517 register int col = 0;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
518 int scan, scan_byte;
44701
2ea69a6d8885 (Fmove_to_column): Remove unused local variable `next_boundary_byte'.
Juanma Barranquero <lekktu@gmail.com>
parents: 44652
diff changeset
519 int next_boundary;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
520 int opoint = PT, opoint_byte = PT_BYTE;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
521
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
522 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
523 current_column_bol_cache = PT;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
524 scan = PT, scan_byte = PT_BYTE;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
525 SET_PT_BOTH (opoint, opoint_byte);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
526 next_boundary = scan;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
527
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
528 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
529
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
530 /* Scan forward to the target position. */
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
531 while (scan < opoint)
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
532 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
533 int c;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
534
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
535 /* Occasionally we may need to skip invisible text. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
536 while (scan == next_boundary)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
537 {
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
538 int old_scan = scan;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
539 /* This updates NEXT_BOUNDARY to the next place
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
540 where we might need to skip more invisible text. */
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
541 scan = skip_invisible (scan, &next_boundary, opoint, Qnil);
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
542 if (scan >= opoint)
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
543 goto endloop;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
544 if (scan != old_scan)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
545 scan_byte = CHAR_TO_BYTE (scan);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
546 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
547
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
548 /* Check composition sequence. */
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
549 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
550 int len, len_byte, width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
551
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
552 if (check_composition (scan, scan_byte, opoint,
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
553 &len, &len_byte, &width))
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
554 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
555 scan += len;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
556 scan_byte += len_byte;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
557 if (scan <= opoint)
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
558 col += width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
559 continue;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
560 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
561 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
562
20694
83a65a1efdaa (current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20571
diff changeset
563 c = FETCH_BYTE (scan_byte);
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
564
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
565 if (dp != 0
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
566 && ! (multibyte && BASE_LEADING_CODE_P (c))
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
567 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
568 {
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
569 Lisp_Object charvec;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
570 EMACS_INT i, n;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
571
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
572 /* This character is displayed using a vector of glyphs.
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
573 Update the column based on those glyphs. */
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
574
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
575 charvec = DISP_CHAR_VECTOR (dp, c);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
576 n = ASIZE (charvec);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
577
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
578 for (i = 0; i < n; i++)
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
579 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
580 /* This should be handled the same as
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
581 next_element_from_display_vector does it. */
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
582 Lisp_Object entry;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
583 entry = AREF (charvec, i);
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
584
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
585 if (INTEGERP (entry)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
586 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
587 c = FAST_GLYPH_CHAR (XFASTINT (entry));
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
588 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
589 c = ' ';
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
590
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
591 if (c == '\n')
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
592 goto endloop;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
593 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
594 goto endloop;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
595 if (c == '\t')
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
596 {
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
597 col += tab_width;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
598 col = col / tab_width * tab_width;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
599 }
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
600 else
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
601 ++col;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
602 }
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
603 }
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
604 else
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
605 {
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
606 /* The display table says nothing for this character.
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
607 Display it as itself. */
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
608
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
609 if (c == '\n')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
610 goto endloop;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
611 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
612 goto endloop;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
613 if (c == '\t')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
614 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
615 col += tab_width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
616 col = col / tab_width * tab_width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
617 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
618 else if (multibyte && BASE_LEADING_CODE_P (c))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
619 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
620 unsigned char *ptr;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
621 int bytes, width, wide_column;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
622
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
623 ptr = BYTE_POS_ADDR (scan_byte);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
624 MULTIBYTE_BYTES_WIDTH (ptr, dp);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
625 scan_byte += bytes;
41258
7ed8a77c5b40 (current_column_1): Fix handling of scan_bytes for mb chars.
Richard M. Stallman <rms@gnu.org>
parents: 40836
diff changeset
626 /* Subtract one to compensate for the increment
7ed8a77c5b40 (current_column_1): Fix handling of scan_bytes for mb chars.
Richard M. Stallman <rms@gnu.org>
parents: 40836
diff changeset
627 that is going to happen below. */
7ed8a77c5b40 (current_column_1): Fix handling of scan_bytes for mb chars.
Richard M. Stallman <rms@gnu.org>
parents: 40836
diff changeset
628 scan_byte--;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
629 col += width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
630 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
631 else if (ctl_arrow && (c < 040 || c == 0177))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
632 col += 2;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
633 else if (c < 040 || c >= 0177)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
634 col += 4;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
635 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
636 col++;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
637 }
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
638 scan++;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
639 scan_byte++;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
640
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
641 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
642 endloop:
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
643
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
644 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
645 last_known_column_point = PT;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
646 last_known_column_modified = MODIFF;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
647
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
648 return col;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
649 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
650
37917
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
651
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
652 #if 0 /* Not used. */
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
653
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
654 /* Return the width in columns of the part of STRING from BEG to END.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
655 If BEG is nil, that stands for the beginning of STRING.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
656 If END is nil, that stands for the end of STRING. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
657
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
658 static double
11704
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
659 string_display_width (string, beg, end)
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
660 Lisp_Object string, beg, end;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
661 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
662 register int col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
663 register unsigned char *ptr, *stop;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
664 register int tab_seen;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
665 int post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
666 register int c;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
667 register int tab_width = XINT (current_buffer->tab_width);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
668 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
669 register struct Lisp_Char_Table *dp = buffer_display_table ();
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
670 int b, e;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
671
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
672 if (NILP (end))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46303
diff changeset
673 e = SCHARS (string);
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
674 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
675 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
676 CHECK_NUMBER (end);
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
677 e = XINT (end);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
678 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
679
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
680 if (NILP (beg))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
681 b = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
682 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
683 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
684 CHECK_NUMBER (beg);
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
685 b = XINT (beg);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
686 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
687
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
688 /* Make a pointer for decrementing through the chars before point. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46303
diff changeset
689 ptr = SDATA (string) + e;
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
690 /* Make a pointer to where consecutive chars leave off,
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
691 going backwards from point. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46303
diff changeset
692 stop = SDATA (string) + b;
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
693
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
694 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
695
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
696 col = 0, tab_seen = 0, post_tab = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
697
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
698 while (1)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
699 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
700 if (ptr == stop)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
701 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
702
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
703 c = *--ptr;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
704 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
705 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
706 else if (c >= 040 && c < 0177)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
707 col++;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
708 else if (c == '\n')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
709 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
710 else if (c == '\t')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
711 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
712 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
713 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
714
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
715 post_tab += col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
716 col = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
717 tab_seen = 1;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
718 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
719 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
720 col += (ctl_arrow && c < 0200) ? 2 : 4;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
721 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
722
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
723 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
724 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
725 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
726 col += post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
727 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
728
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
729 return col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
730 }
37917
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
731
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
732 #endif /* 0 */
5bc9314b5f0a (string_display_width): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 36846
diff changeset
733
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
734
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
736 doc: /* Indent from point with tabs and spaces until COLUMN is reached.
72885
0e86882b32a9 (Fcurrent_column, Findent_to): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 72575
diff changeset
737 Optional second argument MINIMUM says always do at least MINIMUM spaces
0e86882b32a9 (Fcurrent_column, Findent_to): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 72575
diff changeset
738 even if that goes past COLUMN; by default, MINIMUM is zero. */)
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
739 (column, minimum)
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
740 Lisp_Object column, minimum;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
742 int mincol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
743 register int fromcol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
745
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
746 CHECK_NUMBER (column);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
747 if (NILP (minimum))
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
748 XSETFASTINT (minimum, 0);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
749 CHECK_NUMBER (minimum);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
750
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
751 fromcol = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
752 mincol = fromcol + XINT (minimum);
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
753 if (mincol < XINT (column)) mincol = XINT (column);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
754
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 if (fromcol == mincol)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
756 return make_number (mincol);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
757
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
758 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
759
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
760 if (indent_tabs_mode)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762 Lisp_Object n;
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
763 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
764 if (XFASTINT (n) != 0)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 {
8648
f047d8c6db79 (Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents: 8601
diff changeset
766 Finsert_char (make_number ('\t'), n, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
767
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
768 fromcol = (mincol / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
769 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
770 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
771
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
772 XSETFASTINT (column, mincol - fromcol);
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
773 Finsert_char (make_number (' '), column, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
774
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
775 last_known_column = mincol;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
776 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
777 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
778
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
779 XSETINT (column, mincol);
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
780 return column;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
781 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
782
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
783
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
784 static double position_indentation P_ ((int));
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21496
diff changeset
785
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
787 0, 0, 0,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
788 doc: /* Return the indentation of the current line.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
789 This is the horizontal position of the character
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
790 following any initial whitespace. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
791 ()
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
792 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
793 Lisp_Object val;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
794 int opoint = PT, opoint_byte = PT_BYTE;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
795
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
796 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
797
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
798 XSETFASTINT (val, (int) position_indentation (PT_BYTE)); /* iftc */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
799 SET_PT_BOTH (opoint, opoint_byte);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
803 static double
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
804 position_indentation (pos_byte)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
805 register int pos_byte;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
806 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
807 register int column = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
808 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809 register unsigned char *p;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
810 register unsigned char *stop;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
811 unsigned char *start;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
812 int next_boundary_byte = pos_byte;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
813 int ceiling = next_boundary_byte;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
814
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
815 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
816
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
817 p = BYTE_POS_ADDR (pos_byte);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
818 /* STOP records the value of P at which we will need
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
819 to think about the gap, or about invisible text,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
820 or about the end of the buffer. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
821 stop = p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
822 /* START records the starting value of P. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
823 start = p;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
824 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
825 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
826 while (p == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
827 {
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
828 int stop_pos_byte;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
829
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
830 /* If we have updated P, set POS_BYTE to match.
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
831 The first time we enter the loop, POS_BYTE is already right. */
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
832 if (p != start)
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
833 pos_byte = PTR_BYTE_POS (p);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
834 /* Consider the various reasons STOP might have been set here. */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
835 if (pos_byte == ZV_BYTE)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
836 return column;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
837 if (pos_byte == next_boundary_byte)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
838 {
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
839 int next_boundary;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
840 int pos = BYTE_TO_CHAR (pos_byte);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
841 pos = skip_invisible (pos, &next_boundary, ZV, Qnil);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
842 pos_byte = CHAR_TO_BYTE (pos);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
843 next_boundary_byte = CHAR_TO_BYTE (next_boundary);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
844 }
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
845 if (pos_byte >= ceiling)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
846 ceiling = BUFFER_CEILING_OF (pos_byte) + 1;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
847 /* Compute the next place we need to stop and think,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
848 and set STOP accordingly. */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
849 stop_pos_byte = min (ceiling, next_boundary_byte);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
850 /* The -1 and +1 arrange to point at the first byte of gap
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
851 (if STOP_POS_BYTE is the position of the gap)
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
852 rather than at the data after the gap. */
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
853
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
854 stop = BYTE_POS_ADDR (stop_pos_byte - 1) + 1;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
855 p = BYTE_POS_ADDR (pos_byte);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
856 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
857 switch (*p++)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
858 {
20256
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
859 case 0240:
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
860 if (! NILP (current_buffer->enable_multibyte_characters))
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
861 return column;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 case ' ':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 column++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 case '\t':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 column += tab_width - column % tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 default:
20256
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
869 if (ASCII_BYTE_P (p[-1])
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
870 || NILP (current_buffer->enable_multibyte_characters))
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
871 return column;
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
872 {
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
873 int c;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
874 pos_byte = PTR_BYTE_POS (p - 1);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
875 c = FETCH_MULTIBYTE_CHAR (pos_byte);
20256
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
876 if (CHAR_HAS_CATEGORY (c, ' '))
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
877 {
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
878 column++;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
879 INC_POS (pos_byte);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
880 p = BYTE_POS_ADDR (pos_byte);
20256
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
881 }
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
882 else
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
883 return column;
f75208097eb5 (position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents: 19938
diff changeset
884 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
886 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
887 }
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
888
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
889 /* Test whether the line beginning at POS is indented beyond COLUMN.
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
890 Blank lines are treated as if they had the same indentation as the
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
891 preceding line. */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
892
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
893 int
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
894 indented_beyond_p (pos, pos_byte, column)
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
895 int pos, pos_byte;
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
896 double column;
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
897 {
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
898 double val;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
899 int opoint = PT, opoint_byte = PT_BYTE;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
900
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
901 SET_PT_BOTH (pos, pos_byte);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
902 while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
903 scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
904
21525
0ed9ea6eeef3 (indented_beyond_p): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
905 val = position_indentation (PT_BYTE);
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
906 SET_PT_BOTH (opoint, opoint_byte);
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
907 return val >= column; /* hmm, float comparison */
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
908 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
909
13124
e44b06fc718d (Fmove_to_column): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 12244
diff changeset
910 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
911 doc: /* Move point to column COLUMN in the current line.
75652
bd6d4488b990 (Fmove_to_column): Document that the argument COLUMN is taken from prefix
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
912 Interactively, COLUMN is the value of prefix numeric argument.
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
913 The column of a character is calculated by adding together the widths
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
914 as displayed of the previous characters in the line.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
915 This function ignores line-continuation;
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
916 there is no upper limit on the column number a character can have
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
917 and horizontal scrolling has no effect.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
918
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
919 If specified column is within a character, point goes after that character.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
920 If it's past end of line, point goes to end of line.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
921
75652
bd6d4488b990 (Fmove_to_column): Document that the argument COLUMN is taken from prefix
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
922 Optional second argument FORCE non-nil means if COLUMN is in the
bd6d4488b990 (Fmove_to_column): Document that the argument COLUMN is taken from prefix
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
923 middle of a tab character, change it to spaces.
bd6d4488b990 (Fmove_to_column): Document that the argument COLUMN is taken from prefix
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
924 In addition, if FORCE is t, and the line is too short to reach
bd6d4488b990 (Fmove_to_column): Document that the argument COLUMN is taken from prefix
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
925 COLUMN, add spaces/tabs to get there.
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
926
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
927 The return value is the current column. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
928 (column, force)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 Lisp_Object column, force;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
930 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
931 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
932 register int col = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 register int goal;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934 register int end;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
935 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
936 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
937 register struct Lisp_Char_Table *dp = buffer_display_table ();
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
938 register int multibyte = !NILP (current_buffer->enable_multibyte_characters);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 Lisp_Object val;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31102
diff changeset
941 int prev_col = 0;
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31102
diff changeset
942 int c = 0;
44701
2ea69a6d8885 (Fmove_to_column): Remove unused local variable `next_boundary_byte'.
Juanma Barranquero <lekktu@gmail.com>
parents: 44652
diff changeset
943 int next_boundary, pos_byte;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
944
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
945 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
946 CHECK_NATNUM (column);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
947 goal = XINT (column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
948
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
949 pos = PT;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
950 pos_byte = PT_BYTE;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
951 end = ZV;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
952 next_boundary = pos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
954 /* If we're starting past the desired column,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
955 back up to beginning of line and scan from there. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
956 if (col > goal)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
957 {
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
958 end = pos;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
959 pos = current_column_bol_cache;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
960 pos_byte = CHAR_TO_BYTE (pos);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
961 col = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
962 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
963
15554
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
964 while (pos < end)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
965 {
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
966 while (pos == next_boundary)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
967 {
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
968 int prev = pos;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
969 pos = skip_invisible (pos, &next_boundary, end, Qnil);
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
970 if (pos != prev)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
971 pos_byte = CHAR_TO_BYTE (pos);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
972 if (pos >= end)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
973 goto endloop;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
974 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
975
15554
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
976 /* Test reaching the goal column. We do this after skipping
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
977 invisible characters, so that we put point before the
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
978 character on which the cursor will appear. */
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
979 if (col >= goal)
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
980 break;
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
981
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
982 /* Check composition sequence. */
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
983 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
984 int len, len_byte, width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
985
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
986 if (check_composition (pos, pos_byte, Z, &len, &len_byte, &width))
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
987 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
988 pos += len;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
989 pos_byte += len_byte;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
990 col += width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
991 continue;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
992 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
993 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
994
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
995 c = FETCH_BYTE (pos_byte);
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
996
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
997 /* See if there is a display table and it relates
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
998 to this character. */
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
999
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1000 if (dp != 0
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1001 && ! (multibyte && BASE_LEADING_CODE_P (c))
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1002 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
1003 {
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1004 Lisp_Object charvec;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1005 EMACS_INT i, n;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1006
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1007 /* This character is displayed using a vector of glyphs.
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1008 Update the position based on those glyphs. */
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1009
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1010 charvec = DISP_CHAR_VECTOR (dp, c);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1011 n = ASIZE (charvec);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1012
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1013 for (i = 0; i < n; i++)
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1014 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1015 /* This should be handled the same as
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1016 next_element_from_display_vector does it. */
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1017
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1018 Lisp_Object entry;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1019 entry = AREF (charvec, i);
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1020
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1021 if (INTEGERP (entry)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1022 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1023 c = FAST_GLYPH_CHAR (XFASTINT (entry));
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1024 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1025 c = ' ';
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1026
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1027 if (c == '\n')
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1028 goto endloop;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1029 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1030 goto endloop;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1031 if (c == '\t')
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1032 {
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1033 prev_col = col;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1034 col += tab_width;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1035 col = col / tab_width * tab_width;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1036 }
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1037 else
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1038 ++col;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1039 }
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1040 }
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1041 else
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1042 {
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1043 /* The display table doesn't affect this character;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1044 it displays as itself. */
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1045
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1046 if (c == '\n')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1047 goto endloop;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1048 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1049 goto endloop;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1050 if (c == '\t')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1051 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1052 prev_col = col;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1053 col += tab_width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1054 col = col / tab_width * tab_width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1055 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1056 else if (ctl_arrow && (c < 040 || c == 0177))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1057 col += 2;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1058 else if (c < 040 || c == 0177)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1059 col += 4;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1060 else if (c < 0177)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1061 col++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1062 else if (multibyte && BASE_LEADING_CODE_P (c))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1063 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1064 /* Start of multi-byte form. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1065 unsigned char *ptr;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1066 int bytes, width, wide_column;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1067
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1068 ptr = BYTE_POS_ADDR (pos_byte);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1069 MULTIBYTE_BYTES_WIDTH (ptr, dp);
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1070 pos_byte += bytes - 1;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1071 col += width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1072 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1073 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1074 col += 4;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1075 }
40720
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1076
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1077 pos++;
db9254d9c5d0 (current_column_1, Fmove_to_column): Separate the code
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
1078 pos_byte++;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 }
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1080 endloop:
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1082 SET_PT_BOTH (pos, pos_byte);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 /* If a tab char made us overshoot, change it to spaces
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 and scan through it again. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
1086 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 {
28933
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1088 int goal_pt, goal_pt_byte;
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1089
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1090 /* Insert spaces in front of the tab to reach GOAL. Do this
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1091 first so that a marker at the end of the tab gets
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1092 adjusted. */
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1093 SET_PT_BOTH (PT - 1, PT_BYTE - 1);
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1094 Finsert_char (make_number (' '), make_number (goal - prev_col), Qt);
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
1095
28933
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1096 /* Now delete the tab, and indent to COL. */
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1097 del_range (PT, PT + 1);
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1098 goal_pt = PT;
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1099 goal_pt_byte = PT_BYTE;
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
1100 Findent_to (make_number (col), Qnil);
28933
bb0cf4868e70 (Fmove_to_column): When ending within a tab, insert
Gerd Moellmann <gerd@gnu.org>
parents: 28537
diff changeset
1101 SET_PT_BOTH (goal_pt, goal_pt_byte);
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1102
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1103 /* Set the last_known... vars consistently. */
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1104 col = goal;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 /* If line ends prematurely, add space to the end. */
25073
0cac51b5af77 (Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents: 25028
diff changeset
1108 if (col < goal && EQ (force, Qt))
1208
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
1109 Findent_to (make_number (col = goal), Qnil);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
1112 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1115 XSETFASTINT (val, col);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1119 /* compute_motion: compute buffer posn given screen posn and vice versa */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1120
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1121 struct position val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123 /* Scan the current buffer forward from offset FROM, pretending that
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1124 this is at line FROMVPOS, column FROMHPOS, until reaching buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1125 offset TO or line TOVPOS, column TOHPOS (whichever comes first),
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1126 and return the ending buffer position and screen location. If we
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1127 can't hit the requested column exactly (because of a tab or other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1128 multi-column character), overshoot.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1129
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1130 DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1131 at FROM. This is the case if FROMVPOS and FROMVPOS came from an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1132 earlier call to compute_motion. The other common case is that FROMHPOS
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1133 is zero and FROM is a position that "belongs" at column zero, but might
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1134 be shifted by overlay strings; in this case DID_MOTION should be 0.
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1135
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 WIDTH is the number of columns available to display text;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 compute_motion uses this to handle continuation lines and such.
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1138 If WIDTH is -1, use width of window's text area adjusted for
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1139 continuation glyph when needed.
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1140
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1141 HSCROLL is the number of columns not being displayed at the left
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 margin; this is usually taken from a window's hscroll member.
543
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
1143 TAB_OFFSET is the number of columns of the first tab that aren't
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
1144 being displayed, perhaps because of a continuation line or
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
1145 something.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1146
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 compute_motion returns a pointer to a struct position. The bufpos
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 member gives the buffer position at the end of the scan, and hpos
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1149 and vpos give its cartesian location. prevhpos is the column at
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1150 which the character before bufpos started, and contin is non-zero
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1151 if we reached the current line by continuing the previous.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1152
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1153 Note that FROMHPOS and TOHPOS should be expressed in real screen
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1154 columns, taking HSCROLL and the truncation glyph at the left margin
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1155 into account. That is, beginning-of-line moves you to the hpos
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1156 -HSCROLL + (HSCROLL > 0).
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1158 For example, to find the buffer position of column COL of line LINE
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 of a certain window, pass the window's starting location as FROM
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 and the window's upper-left coordinates as FROMVPOS and FROMHPOS.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1161 Pass the buffer's ZV as TO, to limit the scan to the end of the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 visible section of the buffer, and pass LINE and COL as TOVPOS and
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1163 TOHPOS.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1164
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165 When displaying in window w, a typical formula for WIDTH is:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167 window_width - 1
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
1168 - (has_vertical_scroll_bars
51206
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1169 ? WINDOW_CONFIG_SCROLL_BAR_COLS (window)
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1170 : (window_width + window_left != frame_cols))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1171
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1172 where
51206
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1173 window_width is XFASTINT (w->total_cols),
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1174 window_left is XFASTINT (w->left_col),
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
1175 has_vertical_scroll_bars is
51206
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1176 WINDOW_HAS_VERTICAL_SCROLL_BAR (window)
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1177 and frame_cols = FRAME_COLS (XFRAME (window->frame))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1178
51206
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1179 Or you can let window_box_text_cols do this all for you, and write:
22a5614b558f Make (few) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 48587
diff changeset
1180 window_box_text_cols (w) - 1
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
1181
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
1182 The `-1' accounts for the continuation-line backslashes; the rest
5941
c4cceb65fc5a Fix comments.
Karl Heuer <kwzh@gnu.org>
parents: 5845
diff changeset
1183 accounts for window borders if the window is split horizontally, and
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
1184 the scroll bars if they are turned on. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1185
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1186 struct position *
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1187 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1188 int from, fromvpos, fromhpos, to, tovpos, tohpos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1189 int did_motion;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1190 register int width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1191 int hscroll, tab_offset;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1192 struct window *win;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1193 {
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1194 register int hpos = fromhpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1195 register int vpos = fromvpos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 register int pos;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1198 int pos_byte;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31102
diff changeset
1199 register int c = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 register int tab_width = XFASTINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
1201 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
1202 register struct Lisp_Char_Table *dp = window_display_table (win);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1204 = (INTEGERP (current_buffer->selective_display)
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1205 ? XINT (current_buffer->selective_display)
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1206 : !NILP (current_buffer->selective_display) ? -1 : 0);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 int selective_rlen
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1208 = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
2017
ffa43acb7de7 (current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
1209 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1210 /* The next location where the `invisible' property changes, or an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1211 overlay starts or ends. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1212 int next_boundary = from;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1214 /* For computing runs of characters with similar widths.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1215 Invariant: width_run_width is zero, or all the characters
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1216 from width_run_start to width_run_end have a fixed width of
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1217 width_run_width. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1218 int width_run_start = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1219 int width_run_end = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1220 int width_run_width = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1221 Lisp_Object *width_table;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1222 Lisp_Object buffer;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1223
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1224 /* The next buffer pos where we should consult the width run cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1225 int next_width_run = from;
15059
3b7454f2d662 (compute_motion): Pass window to Fget_char_property.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1226 Lisp_Object window;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1227
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1228 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
21996
60178dff673f Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21995
diff changeset
1229 /* If previous char scanned was a wide character,
60178dff673f Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21995
diff changeset
1230 this is the column where it ended. Otherwise, this is 0. */
60178dff673f Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21995
diff changeset
1231 int wide_column_end_hpos = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1232 int prev_pos; /* Previous buffer position. */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1233 int prev_pos_byte; /* Previous buffer position. */
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1234 int prev_hpos = 0;
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1235 int prev_vpos = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1236 int contin_hpos; /* HPOS of last column of continued line. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1237 int prev_tab_offset; /* Previous tab offset. */
56593
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1238 int continuation_glyph_width;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1239
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1240 XSETBUFFER (buffer, current_buffer);
15059
3b7454f2d662 (compute_motion): Pass window to Fget_char_property.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1241 XSETWINDOW (window, win);
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1242
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1243 width_run_cache_on_off ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1244 if (dp == buffer_display_table ())
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1245 width_table = (VECTORP (current_buffer->width_table)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1246 ? XVECTOR (current_buffer->width_table)->contents
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1247 : 0);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1248 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1249 /* If the window has its own display table, we can't use the width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1250 run cache, because that's based on the buffer's display table. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1251 width_table = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1252
28537
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1253 if (tab_width <= 0 || tab_width > 1000)
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1254 tab_width = 8;
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1255
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1256 /* Negative width means use all available text columns. */
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1257 if (width < 0)
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1258 {
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1259 width = window_box_text_cols (win);
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1260 /* We must make room for continuation marks if we don't have fringes. */
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1261 #ifdef HAVE_WINDOW_SYSTEM
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1262 if (!FRAME_WINDOW_P (XFRAME (win->frame)))
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1263 #endif
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1264 width -= 1;
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1265 }
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1266
56594
5b9242222549 (compute_motion): Fix last change.
Kim F. Storm <storm@cua.dk>
parents: 56593
diff changeset
1267 continuation_glyph_width = 1;
56593
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1268 #ifdef HAVE_WINDOW_SYSTEM
56594
5b9242222549 (compute_motion): Fix last change.
Kim F. Storm <storm@cua.dk>
parents: 56593
diff changeset
1269 if (FRAME_WINDOW_P (XFRAME (win->frame)))
5b9242222549 (compute_motion): Fix last change.
Kim F. Storm <storm@cua.dk>
parents: 56593
diff changeset
1270 continuation_glyph_width = 0; /* In the fringe. */
56593
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1271 #endif
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1272
28537
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1273 immediate_quit = 1;
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1274 QUIT;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1275
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1276 pos = prev_pos = from;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1277 pos_byte = prev_pos_byte = CHAR_TO_BYTE (from);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1278 contin_hpos = 0;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1279 prev_tab_offset = tab_offset;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1280 while (1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1281 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1282 while (pos == next_boundary)
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
1283 {
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1284 int pos_here = pos;
17966
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1285 int newpos;
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1286
22245
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1287 /* Don't skip invisible if we are already at the margin. */
41900
e9a72f369214 (compute_motion): Likewise.
Pavel Janík <Pavel@Janik.cz>
parents: 41258
diff changeset
1288 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
22245
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1289 {
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1290 if (contin_hpos && prev_hpos == 0
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1291 && hpos > tohpos
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1292 && (contin_hpos == width || wide_column_end_hpos > width))
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1293 { /* Line breaks because we can't put the character at the
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1294 previous line any more. It is not the multi-column
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1295 character continued in middle. Go back to previous
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1296 buffer position, screen position, and set tab offset
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1297 to previous value. It's the beginning of the
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1298 line. */
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1299 pos = prev_pos;
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1300 pos_byte = prev_pos_byte;
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1301 hpos = prev_hpos;
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1302 vpos = prev_vpos;
22245
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1303 tab_offset = prev_tab_offset;
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1304 }
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1305 break;
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1306 }
94da16d936b6 (compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents: 22000
diff changeset
1307
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1308 /* If the caller says that the screen position came from an earlier
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1309 call to compute_motion, then we've already accounted for the
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1310 overlay strings at point. This is only true the first time
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1311 through, so clear the flag after testing it. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1312 if (!did_motion)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1313 /* We need to skip past the overlay strings. Currently those
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1314 strings must not contain TAB;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1315 if we want to relax that restriction, something will have
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1316 to be changed here. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1317 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1318 unsigned char *ovstr;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1319 int ovlen = overlay_strings (pos, win, &ovstr);
21283
c431691cbff1 (compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents: 21275
diff changeset
1320 hpos += ((multibyte && ovlen > 0)
c431691cbff1 (compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents: 21275
diff changeset
1321 ? strwidth (ovstr, ovlen) : ovlen);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1322 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1323 did_motion = 0;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1324
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1325 if (pos >= to)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1326 break;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1327
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1328 /* Advance POS past invisible characters
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1329 (but not necessarily all that there are here),
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1330 and store in next_boundary the next position where
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1331 we need to call skip_invisible. */
17966
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1332 newpos = skip_invisible (pos, &next_boundary, to, window);
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1333
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1334 if (newpos >= to)
21919
0c3d6e2c4176 (compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents: 21525
diff changeset
1335 {
0c3d6e2c4176 (compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents: 21525
diff changeset
1336 pos = min (to, newpos);
33871
69c9cd380fd2 (compute_motion): Keep pos_byte in sync with pos.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
1337 pos_byte = CHAR_TO_BYTE (pos);
21919
0c3d6e2c4176 (compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents: 21525
diff changeset
1338 goto after_loop;
0c3d6e2c4176 (compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents: 21525
diff changeset
1339 }
17966
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1340
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1341 if (newpos != pos_here)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1342 {
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1343 pos = newpos;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1344 pos_byte = CHAR_TO_BYTE (pos);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1345 }
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
1346 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1347
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1348 /* Handle right margin. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1349 /* Note on a wide-column character.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1350
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1351 Characters are classified into the following three categories
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1352 according to the width (columns occupied on screen).
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1353
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1354 (1) single-column character: ex. `a'
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1355 (2) multi-column character: ex. `^A', TAB, `\033'
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1356 (3) wide-column character: ex. Japanese character, Chinese character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1357 (In the following example, `W_' stands for them.)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1358
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1359 Multi-column characters can be divided around the right margin,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1360 but wide-column characters cannot.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1361
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1362 NOTE:
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1363
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1364 (*) The cursor is placed on the next character after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1365
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1366 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1367 abcdefghi\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1368 j ^---- next after the point
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1369 ^--- next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1370 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1371 In case of sigle-column character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1372
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1373 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1374 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1375 033 ^---- next after the point, next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1376 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1377 In case of multi-column character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1378
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1379 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1380 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1381 W_ ^---- next after the point
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1382 ^---- next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1383 ----------
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1384 In case of wide-column character
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1385
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1386 The problem here is continuation at a wide-column character.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1387 In this case, the line may shorter less than WIDTH.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1388 And we find the continuation AFTER it occurs.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1389
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1390 */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1391
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1392 if (hpos > width)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1393 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1394 if (hscroll
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1395 || (truncate_partial_width_windows
56593
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1396 && ((width + continuation_glyph_width)
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1397 < FRAME_COLS (XFRAME (WINDOW_FRAME (win)))))
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1398 || !NILP (current_buffer->truncate_lines))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1399 {
20876
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1400 /* Truncating: skip to newline, unless we are already past
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1401 TO (we need to go back below). */
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1402 if (pos <= to)
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1403 {
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1404 pos = find_before_next_newline (pos, to, 1);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1405 pos_byte = CHAR_TO_BYTE (pos);
20876
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1406 hpos = width;
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1407 /* If we just skipped next_boundary,
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1408 loop around in the main while
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1409 and handle it. */
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1410 if (pos >= next_boundary)
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1411 next_boundary = pos + 1;
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1412 prev_hpos = width;
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1413 prev_vpos = vpos;
20876
c80b908e5af5 (compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents: 20706
diff changeset
1414 prev_tab_offset = tab_offset;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1415 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1416 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1417 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1418 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1419 /* Continuing. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1420 /* Remember the previous value. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1421 prev_tab_offset = tab_offset;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1422
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1423 if (wide_column_end_hpos > width)
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1424 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1425 hpos -= prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1426 tab_offset += prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1427 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1428 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1429 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1430 tab_offset += width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1431 hpos -= width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1432 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1433 vpos++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1434 contin_hpos = prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1435 prev_hpos = 0;
55311
d5519e60c9c6 (compute_motion): Save vpos in prev_vpos when dealing
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54727
diff changeset
1436 prev_vpos = vpos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1437 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1438 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1439
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1440 /* Stop if past the target buffer position or screen position. */
21994
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1441 if (pos > to)
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1442 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1443 /* Go back to the previous position. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1444 pos = prev_pos;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1445 pos_byte = prev_pos_byte;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1446 hpos = prev_hpos;
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1447 vpos = prev_vpos;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1448 tab_offset = prev_tab_offset;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1449
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1450 /* NOTE on contin_hpos, hpos, and prev_hpos.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1451
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1452 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1453 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1454 W_ ^---- contin_hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1455 | ^----- hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1456 \---- prev_hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1457 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1458 */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1459
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1460 if (contin_hpos && prev_hpos == 0
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1461 && contin_hpos < width && !wide_column_end_hpos)
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1462 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1463 /* Line breaking occurs in the middle of multi-column
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1464 character. Go back to previous line. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1465 hpos = contin_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1466 vpos = vpos - 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1467 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1468 break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1469 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1470
41900
e9a72f369214 (compute_motion): Likewise.
Pavel Janík <Pavel@Janik.cz>
parents: 41258
diff changeset
1471 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
21994
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1472 {
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1473 if (contin_hpos && prev_hpos == 0
22000
55f17d895354 Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21996
diff changeset
1474 && hpos > tohpos
55f17d895354 Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21996
diff changeset
1475 && (contin_hpos == width || wide_column_end_hpos > width))
21994
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1476 { /* Line breaks because we can't put the character at the
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1477 previous line any more. It is not the multi-column
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1478 character continued in middle. Go back to previous
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1479 buffer position, screen position, and set tab offset
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1480 to previous value. It's the beginning of the
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1481 line. */
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1482 pos = prev_pos;
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1483 pos_byte = prev_pos_byte;
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1484 hpos = prev_hpos;
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1485 vpos = prev_vpos;
21994
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1486 tab_offset = prev_tab_offset;
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1487 }
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1488 break;
e244c4d9b0ca (compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents: 21991
diff changeset
1489 }
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1490 if (pos == ZV) /* We cannot go beyond ZV. Stop here. */
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1491 break;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1492
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1493 prev_hpos = hpos;
54240
867a22140904 (compute_motion): Save vpos in prev_vpos, like hpos etc.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1494 prev_vpos = vpos;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1495 prev_pos = pos;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1496 prev_pos_byte = pos_byte;
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1497 wide_column_end_hpos = 0;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1498
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1499 /* Consult the width run cache to see if we can avoid inspecting
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1500 the text character-by-character. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1501 if (current_buffer->width_run_cache && pos >= next_width_run)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1502 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1503 int run_end;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1504 int common_width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1505 = region_cache_forward (current_buffer,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1506 current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1507 pos, &run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1508
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1509 /* A width of zero means the character's width varies (like
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1510 a tab), is meaningless (like a newline), or we just don't
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1511 want to skip over it for some other reason. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1512 if (common_width != 0)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1513 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1514 int run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1515
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1516 /* Don't go past the final buffer posn the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1517 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1518 if (run_end > to)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1519 run_end = to;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1520
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1521 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1522
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1523 /* Don't go past the final horizontal position the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1524 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1525 if (vpos == tovpos && run_end_hpos > tohpos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1526 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1527 run_end = pos + (tohpos - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1528 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1529 }
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1530
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1531 /* Don't go past the margin. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1532 if (run_end_hpos >= width)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1533 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1534 run_end = pos + (width - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1535 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1536 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1537
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1538 hpos = run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1539 if (run_end > pos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1540 prev_hpos = hpos - common_width;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1541 if (pos != run_end)
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1542 {
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1543 pos = run_end;
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1544 pos_byte = CHAR_TO_BYTE (pos);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1545 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1546 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1547
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1548 next_width_run = run_end + 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1549 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1550
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1551 /* We have to scan the text character-by-character. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 else
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1553 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1554 EMACS_INT i, n;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1555 Lisp_Object charvec;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1556
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1557 c = FETCH_BYTE (pos_byte);
26859
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1558
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1559 /* Check composition sequence. */
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1560 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1561 int len, len_byte, width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1562
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1563 if (check_composition (pos, pos_byte, to, &len, &len_byte, &width))
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1564 {
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1565 pos += len;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1566 pos_byte += len_byte;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1567 hpos += width;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1568 continue;
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1569 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1570 }
4cf41c98ad2d (check_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 26404
diff changeset
1571
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1572 pos++, pos_byte++;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1573
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1574 /* Perhaps add some info to the width_run_cache. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1575 if (current_buffer->width_run_cache)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1576 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1577 /* Is this character part of the current run? If so, extend
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1578 the run. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1579 if (pos - 1 == width_run_end
18109
b8c70b5f5aba (compute_motion): Use XFASTINT on width_table elts.
Richard M. Stallman <rms@gnu.org>
parents: 17966
diff changeset
1580 && XFASTINT (width_table[c]) == width_run_width)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1581 width_run_end = pos;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1582
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1583 /* The previous run is over, since this is a character at a
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1584 different position, or a different width. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1585 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1586 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1587 /* Have we accumulated a run to put in the cache?
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1588 (Currently, we only cache runs of width == 1). */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1589 if (width_run_start < width_run_end
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1590 && width_run_width == 1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1591 know_region_cache (current_buffer,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1592 current_buffer->width_run_cache,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1593 width_run_start, width_run_end);
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1594
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1595 /* Start recording a new width run. */
18109
b8c70b5f5aba (compute_motion): Use XFASTINT on width_table elts.
Richard M. Stallman <rms@gnu.org>
parents: 17966
diff changeset
1596 width_run_width = XFASTINT (width_table[c]);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1597 width_run_start = pos - 1;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1598 width_run_end = pos;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1599 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1600 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1601
20938
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1602 if (dp != 0
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1603 && ! (multibyte && BASE_LEADING_CODE_P (c))
12e635300b44 (MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents: 20876
diff changeset
1604 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1605 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1606 charvec = DISP_CHAR_VECTOR (dp, c);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1607 n = ASIZE (charvec);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1608 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1609 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1610 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1611 charvec = Qnil;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1612 n = 1;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1613 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1614
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1615 for (i = n - 1; i >= 0; --i)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1616 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1617 if (VECTORP (charvec))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1618 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1619 /* This should be handled the same as
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1620 next_element_from_display_vector does it. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1621 Lisp_Object entry = AREF (charvec, i);
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1622
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1623 if (INTEGERP (entry)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1624 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1625 c = FAST_GLYPH_CHAR (XFASTINT (entry));
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1626 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1627 c = ' ';
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1628 }
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1629
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1630 if (c >= 040 && c < 0177)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1631 hpos++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1632 else if (c == '\t')
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1633 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1634 int tem = ((hpos + tab_offset + hscroll - (hscroll > 0))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1635 % tab_width);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1636 if (tem < 0)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1637 tem += tab_width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1638 hpos += tab_width - tem;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1639 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1640 else if (c == '\n')
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1641 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1642 if (selective > 0
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1643 && indented_beyond_p (pos, pos_byte,
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
1644 (double) selective)) /* iftc */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1645 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1646 /* If (pos == to), we don't have to take care of
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1647 selective display. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1648 if (pos < to)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1649 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1650 /* Skip any number of invisible lines all at once */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1651 do
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1652 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1653 pos = find_before_next_newline (pos, to, 1);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1654 if (pos < to)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1655 pos++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1656 pos_byte = CHAR_TO_BYTE (pos);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1657 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1658 while (pos < to
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1659 && indented_beyond_p (pos, pos_byte,
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
1660 (double) selective)); /* iftc */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1661 /* Allow for the " ..." that is displayed for them. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1662 if (selective_rlen)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1663 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1664 hpos += selective_rlen;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1665 if (hpos >= width)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1666 hpos = width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1667 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1668 DEC_BOTH (pos, pos_byte);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1669 /* We have skipped the invis text, but not the
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1670 newline after. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1671 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1672 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1673 else
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1674 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1675 /* A visible line. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1676 vpos++;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1677 hpos = 0;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1678 hpos -= hscroll;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1679 /* Count the truncation glyph on column 0 */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1680 if (hscroll > 0)
56593
47fd67a37101 (compute_motion): Fix check for full width window
Kim F. Storm <storm@cua.dk>
parents: 56584
diff changeset
1681 hpos += continuation_glyph_width;
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1682 tab_offset = 0;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1683 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1684 contin_hpos = 0;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1685 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1686 else if (c == CR && selective < 0)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1687 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1688 /* In selective display mode,
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1689 everything from a ^M to the end of the line is invisible.
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1690 Stop *before* the real newline. */
17136
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1691 if (pos < to)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1692 {
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1693 pos = find_before_next_newline (pos, to, 1);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1694 pos_byte = CHAR_TO_BYTE (pos);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1695 }
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1696 /* If we just skipped next_boundary,
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1697 loop around in the main while
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1698 and handle it. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1699 if (pos > next_boundary)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1700 next_boundary = pos;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1701 /* Allow for the " ..." that is displayed for them. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1702 if (selective_rlen)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1703 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1704 hpos += selective_rlen;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1705 if (hpos >= width)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1706 hpos = width;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1707 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1708 }
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1709 else if (multibyte && BASE_LEADING_CODE_P (c))
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1710 {
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1711 /* Start of multi-byte form. */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1712 unsigned char *ptr;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1713 int bytes, width, wide_column;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1714
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1715 pos_byte--; /* rewind POS_BYTE */
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1716 ptr = BYTE_POS_ADDR (pos_byte);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1717 MULTIBYTE_BYTES_WIDTH (ptr, dp);
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1718 pos_byte += bytes;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1719 if (wide_column)
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1720 wide_column_end_hpos = hpos + wide_column;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1721 hpos += width;
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1722 }
38530
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
1723 else if (VECTORP (charvec))
90ab35fe206c (current_column): Fix column computation in the
Gerd Moellmann <gerd@gnu.org>
parents: 37917
diff changeset
1724 ++hpos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1725 else
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1726 hpos += (ctl_arrow && c < 0200) ? 2 : 4;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1727 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730
17966
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1731 after_loop:
aaa25a87ae3d (compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents: 17136
diff changeset
1732
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1733 /* Remember any final width run in the cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1734 if (current_buffer->width_run_cache
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1735 && width_run_width == 1
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1736 && width_run_start < width_run_end)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1737 know_region_cache (current_buffer, current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1738 width_run_start, width_run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1739
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1740 val_compute_motion.bufpos = pos;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1741 val_compute_motion.bytepos = pos_byte;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1742 val_compute_motion.hpos = hpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1743 val_compute_motion.vpos = vpos;
20985
020b0eade8c5 (compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents: 20938
diff changeset
1744 if (contin_hpos && prev_hpos == 0)
020b0eade8c5 (compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents: 20938
diff changeset
1745 val_compute_motion.prevhpos = contin_hpos;
020b0eade8c5 (compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents: 20938
diff changeset
1746 else
020b0eade8c5 (compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents: 20938
diff changeset
1747 val_compute_motion.prevhpos = prev_hpos;
16395
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1748 /* We alalways handle all of them here; none of them remain to do. */
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1749 val_compute_motion.ovstring_chars_done = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1750
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1751 /* Nonzero if have just continued a line */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1752 val_compute_motion.contin = (contin_hpos && prev_hpos == 0);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1753
28537
862f955dfe92 (compute_motion): Set immediate_quit.
Gerd Moellmann <gerd@gnu.org>
parents: 28293
diff changeset
1754 immediate_quit = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755 return &val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1757
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
1758
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1759 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1760 doc: /* Scan through the current buffer, calculating screen position.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1761 Scan the current buffer forward from offset FROM,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1762 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1763 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1764 and return the ending buffer position and screen location.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1765
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1766 If TOPOS is nil, the actual width and height of the window's
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1767 text area are used.
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1768
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1769 There are three additional arguments:
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1770
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1771 WIDTH is the number of columns available to display text;
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1772 this affects handling of continuation lines. A value of nil
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1773 corresponds to the actual number of available text columns.
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1774
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1775 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1776 HSCROLL is the number of columns not being displayed at the left
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1777 margin; this is usually taken from a window's hscroll member.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1778 TAB-OFFSET is the number of columns of the first tab that aren't
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1779 being displayed, perhaps because the line was continued within it.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1780 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1781
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1782 WINDOW is the window to operate on. It is used to choose the display table;
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1783 if it is showing the current buffer, it is used also for
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1784 deciding which overlay properties apply.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1785 Note that `compute-motion' always operates on the current buffer.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1786
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1787 The value is a list of five elements:
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1788 (POS HPOS VPOS PREVHPOS CONTIN)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1789 POS is the buffer position where the scan stopped.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1790 VPOS is the vertical position where the scan stopped.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1791 HPOS is the horizontal position where the scan stopped.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1792
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1793 PREVHPOS is the horizontal position one character back from POS.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1794 CONTIN is t if a line was continued after (or within) the previous character.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1795
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1796 For example, to find the buffer position of column COL of line LINE
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1797 of a certain window, pass the window's starting location as FROM
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1798 and the window's upper-left coordinates as FROMPOS.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1799 Pass the buffer's (point-max) as TO, to limit the scan to the end of the
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1800 visible section of the buffer, and pass LINE and COL as TOPOS. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
1801 (from, frompos, to, topos, width, offsets, window)
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1802 Lisp_Object from, frompos, to, topos;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1803 Lisp_Object width, offsets, window;
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1804 {
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1805 struct window *w;
34967
78e2d17df950 (current_column): Remove unused variable `stopchar'.
Eli Zaretskii <eliz@gnu.org>
parents: 33871
diff changeset
1806 Lisp_Object bufpos, hpos, vpos, prevhpos;
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1807 struct position *pos;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1808 int hscroll, tab_offset;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1809
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1810 CHECK_NUMBER_COERCE_MARKER (from);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1811 CHECK_CONS (frompos);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1812 CHECK_NUMBER_CAR (frompos);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1813 CHECK_NUMBER_CDR (frompos);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1814 CHECK_NUMBER_COERCE_MARKER (to);
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1815 if (!NILP (topos))
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1816 {
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1817 CHECK_CONS (topos);
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1818 CHECK_NUMBER_CAR (topos);
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1819 CHECK_NUMBER_CDR (topos);
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1820 }
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1821 if (!NILP (width))
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1822 CHECK_NUMBER (width);
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1823
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1824 if (!NILP (offsets))
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1825 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1826 CHECK_CONS (offsets);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1827 CHECK_NUMBER_CAR (offsets);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1828 CHECK_NUMBER_CDR (offsets);
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25510
diff changeset
1829 hscroll = XINT (XCAR (offsets));
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25510
diff changeset
1830 tab_offset = XINT (XCDR (offsets));
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1831 }
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1832 else
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1833 hscroll = tab_offset = 0;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1834
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1835 if (NILP (window))
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1836 window = Fselected_window ();
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1837 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
1838 CHECK_LIVE_WINDOW (window);
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1839 w = XWINDOW (window);
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1840
21496
6ec5e85328a9 (Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents: 21283
diff changeset
1841 if (XINT (from) < BEGV || XINT (from) > ZV)
6ec5e85328a9 (Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents: 21283
diff changeset
1842 args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
6ec5e85328a9 (Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents: 21283
diff changeset
1843 if (XINT (to) < BEGV || XINT (to) > ZV)
6ec5e85328a9 (Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents: 21283
diff changeset
1844 args_out_of_range_3 (to, make_number (BEGV), make_number (ZV));
6ec5e85328a9 (Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents: 21283
diff changeset
1845
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25510
diff changeset
1846 pos = compute_motion (XINT (from), XINT (XCDR (frompos)),
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25510
diff changeset
1847 XINT (XCAR (frompos)), 0,
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1848 XINT (to),
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1849 (NILP (topos)
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1850 ? window_internal_height (w)
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1851 : XINT (XCDR (topos))),
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1852 (NILP (topos)
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1853 ? (window_box_text_cols (w)
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1854 - (
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1855 #ifdef HAVE_WINDOW_SYSTEM
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1856 FRAME_WINDOW_P (XFRAME (w->frame)) ? 0 :
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1857 #endif
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1858 1))
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1859 : XINT (XCAR (topos))),
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1860 (NILP (width) ? -1 : XINT (width)),
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1861 hscroll, tab_offset,
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1862 XWINDOW (window));
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1863
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1864 XSETFASTINT (bufpos, pos->bufpos);
9269
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1865 XSETINT (hpos, pos->hpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1866 XSETINT (vpos, pos->vpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1867 XSETINT (prevhpos, pos->prevhpos);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1868
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1869 return Fcons (bufpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1870 Fcons (hpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1871 Fcons (vpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1872 Fcons (prevhpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1873 Fcons (pos->contin ? Qt : Qnil, Qnil)))));
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1874
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1875 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1877 /* Fvertical_motion and vmotion */
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
1878
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1879 struct position val_vmotion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1880
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1881 struct position *
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1882 vmotion (from, vtarget, w)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1883 register int from, vtarget;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1884 struct window *w;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1885 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1886 int hscroll = XINT (w->hscroll);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887 struct position pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 /* vpos is cumulative vertical position, changed as from is changed */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 register int vpos = 0;
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1890 int prevline;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891 register int first;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1892 int from_byte;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1895 = (INTEGERP (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1896 ? XINT (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1897 : !NILP (current_buffer->selective_display) ? -1 : 0);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1898 Lisp_Object window;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1899 int start_hpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1900 int did_motion;
23039
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1901 /* This is the object we use for fetching character properties. */
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1902 Lisp_Object text_prop_object;
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1903
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1904 XSETWINDOW (window, w);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1905
23039
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1906 /* If the window contains this buffer, use it for getting text properties.
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1907 Otherwise use the current buffer as arg for doing that. */
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1908 if (EQ (w->buffer, Fcurrent_buffer ()))
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1909 text_prop_object = window;
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1910 else
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1911 text_prop_object = Fcurrent_buffer ();
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1912
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1913 if (vpos >= vtarget)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1915 /* To move upward, go a line at a time until
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1916 we have gone at least far enough. */
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1917
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1918 first = 1;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1919
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1920 while ((vpos > vtarget || first) && from > BEGV)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1921 {
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1922 Lisp_Object propval;
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1923
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1924 prevline = find_next_newline_no_quit (from - 1, -1);
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1925 while (prevline > BEGV
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1926 && ((selective > 0
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1927 && indented_beyond_p (prevline,
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1928 CHAR_TO_BYTE (prevline),
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
1929 (double) selective)) /* iftc */
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1930 /* Watch out for newlines with `invisible' property.
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1931 When moving upward, check the newline before. */
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1932 || (propval = Fget_char_property (make_number (prevline - 1),
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1933 Qinvisible,
23039
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1934 text_prop_object),
26404
c3c9cc1c2379 Remove USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents: 25645
diff changeset
1935 TEXT_PROP_MEANS_INVISIBLE (propval))))
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1936 prevline = find_next_newline_no_quit (prevline - 1, -1);
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1937 pos = *compute_motion (prevline, 0,
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1938 lmargin + (prevline == BEG ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1939 0,
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1940 from,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1941 /* Don't care for VPOS... */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1942 1 << (BITS_PER_SHORT - 1),
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1943 /* ... nor HPOS. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1944 1 << (BITS_PER_SHORT - 1),
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
1945 -1, hscroll,
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1946 /* This compensates for start_hpos
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1947 so that a tab as first character
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1948 still occupies 8 columns. */
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1949 (prevline == BEG ? -start_hpos : 0),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1950 w);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1951 vpos -= pos.vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1952 first = 0;
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1953 from = prevline;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1954 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1956 /* If we made exactly the desired vertical distance,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1957 or if we hit beginning of buffer,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1958 return point found */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1959 if (vpos >= vtarget)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1960 {
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1961 val_vmotion.bufpos = from;
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1962 val_vmotion.bytepos = CHAR_TO_BYTE (from);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1963 val_vmotion.vpos = vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1964 val_vmotion.hpos = lmargin;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1965 val_vmotion.contin = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1966 val_vmotion.prevhpos = 0;
16395
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1967 val_vmotion.ovstring_chars_done = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1968 val_vmotion.tab_offset = 0; /* For accumulating tab offset. */
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1969 return &val_vmotion;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1970 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1971
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1972 /* Otherwise find the correct spot by moving down */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1973 }
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1974 /* Moving downward is simple, but must calculate from beg of line
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1975 to determine hpos of starting point */
20571
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1976 from_byte = CHAR_TO_BYTE (from);
3e0e568163f5 (current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents: 20371
diff changeset
1977 if (from > BEGV && FETCH_BYTE (from_byte - 1) != '\n')
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1978 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1979 Lisp_Object propval;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1980
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1981 prevline = find_next_newline_no_quit (from, -1);
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1982 while (prevline > BEGV
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1983 && ((selective > 0
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1984 && indented_beyond_p (prevline,
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1985 CHAR_TO_BYTE (prevline),
46303
ebb83f095b2a (last_known_column): Declare as double, not float.
Richard M. Stallman <rms@gnu.org>
parents: 45622
diff changeset
1986 (double) selective)) /* iftc */
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1987 /* Watch out for newlines with `invisible' property.
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1988 When moving downward, check the newline after. */
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1989 || (propval = Fget_char_property (make_number (prevline),
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1990 Qinvisible,
23039
f4262c9a21dd (vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents: 22560
diff changeset
1991 text_prop_object),
26404
c3c9cc1c2379 Remove USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents: 25645
diff changeset
1992 TEXT_PROP_MEANS_INVISIBLE (propval))))
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1993 prevline = find_next_newline_no_quit (prevline - 1, -1);
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1994 pos = *compute_motion (prevline, 0,
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
1995 lmargin + (prevline == BEG
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1996 ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1997 0,
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
1998 from,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1999 /* Don't care for VPOS... */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2000 1 << (BITS_PER_SHORT - 1),
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2001 /* ... nor HPOS. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2002 1 << (BITS_PER_SHORT - 1),
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
2003 -1, hscroll,
57734
32217d296ff3 (vmotion): When moving up, check the newline before.
Richard M. Stallman <rms@gnu.org>
parents: 56594
diff changeset
2004 (prevline == BEG ? -start_hpos : 0),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
2005 w);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
2006 did_motion = 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007 }
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
2008 else
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
2010 pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
2011 pos.vpos = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2012 pos.tab_offset = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
2013 did_motion = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
2015 return compute_motion (from, vpos, pos.hpos, did_motion,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2016 ZV, vtarget, - (1 << (BITS_PER_SHORT - 1)),
56584
e22bbc6b44d1 (compute_motion): Use actual window width if WIDTH is -1,
Kim F. Storm <storm@cua.dk>
parents: 55311
diff changeset
2017 -1, hscroll,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
2018 pos.tab_offset - (from == BEG ? start_hpos : 0),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
2019 w);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
2022 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2023 doc: /* Move point to start of the screen line LINES lines down.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2024 If LINES is negative, this means moving up.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2025
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2026 This function is an ordinary cursor motion function
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2027 which calculates the new position based on how text would be displayed.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2028 The new position may be the start of a line,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2029 or just the start of a continuation line.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2030 The function returns number of screen lines moved over;
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2031 that usually equals LINES, but may be closer to zero
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2032 if beginning or end of buffer was reached.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2033
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2034 The optional second argument WINDOW specifies the window to use for
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2035 parameters such as width, horizontal scrolling, and so on.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2036 The default is to use the selected window's parameters.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2037
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2038 `vertical-motion' always uses the current buffer,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2039 regardless of which buffer is displayed in WINDOW.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2040 This is consistent with other cursor motion functions
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2041 and makes it possible to use `vertical-motion' in any buffer,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2042 whether or not it is currently displayed in some window. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2043 (lines, window)
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
2044 Lisp_Object lines, window;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045 {
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2046 struct it it;
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2047 struct text_pos pt;
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2048 struct window *w;
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2049 Lisp_Object old_buffer;
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2050 struct gcpro gcpro1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2051
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
2052 CHECK_NUMBER (lines);
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
2053 if (! NILP (window))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
2054 CHECK_WINDOW (window);
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
2055 else
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
2056 window = selected_window;
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2057 w = XWINDOW (window);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2058
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2059 old_buffer = Qnil;
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2060 GCPRO1 (old_buffer);
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2061 if (XBUFFER (w->buffer) != current_buffer)
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2062 {
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2063 /* Set the window's buffer temporarily to the current buffer. */
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2064 old_buffer = w->buffer;
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2065 XSETBUFFER (w->buffer, current_buffer);
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2066 }
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
2067
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2068 if (noninteractive)
58260
4a90dc7f2941 (Fvertical_motion): Fix last change. Only reseat when
Kim F. Storm <storm@cua.dk>
parents: 58205
diff changeset
2069 {
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2070 struct position pos;
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2071 pos = *vmotion (PT, XINT (lines), w);
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2072 SET_PT_BOTH (pos.bufpos, pos.bytepos);
58260
4a90dc7f2941 (Fvertical_motion): Fix last change. Only reseat when
Kim F. Storm <storm@cua.dk>
parents: 58205
diff changeset
2073 }
4a90dc7f2941 (Fvertical_motion): Fix last change. Only reseat when
Kim F. Storm <storm@cua.dk>
parents: 58205
diff changeset
2074 else
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2075 {
58396
60b3e92b3dd4 (Fvertical_motion): Fix last change. Use another
Kim F. Storm <storm@cua.dk>
parents: 58317
diff changeset
2076 int it_start;
59647
7d7e154e3e7a (Fvertical_motion): Temporarily disable selective display.
Kim F. Storm <storm@cua.dk>
parents: 58909
diff changeset
2077 int oselective;
75105
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2078 int it_overshoot_expected;
58396
60b3e92b3dd4 (Fvertical_motion): Fix last change. Use another
Kim F. Storm <storm@cua.dk>
parents: 58317
diff changeset
2079
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2080 SET_TEXT_POS (pt, PT, PT_BYTE);
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2081 start_display (&it, w, pt);
44837
ae3c74ba491a (Fvertical_motion): Move to the start of the line
Gerd Moellmann <gerd@gnu.org>
parents: 44701
diff changeset
2082
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2083 /* Scan from the start of the line containing PT. If we don't
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2084 do this, we start moving with IT->current_x == 0, while PT is
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2085 really at some x > 0. The effect is, in continuation lines, that
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2086 we end up with the iterator placed at where it thinks X is 0,
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2087 while the end position is really at some X > 0, the same X that
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2088 PT had. */
58396
60b3e92b3dd4 (Fvertical_motion): Fix last change. Use another
Kim F. Storm <storm@cua.dk>
parents: 58317
diff changeset
2089 it_start = IT_CHARPOS (it);
73140
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2090
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2091 /* We expect the call to move_it_to, further down, to overshoot
74091
4cb12ab18c21 (Fvertical_motion): Include composition in the case of
Kenichi Handa <handa@m17n.org>
parents: 73140
diff changeset
2092 if the starting point is on an image, stretch glyph,
4cb12ab18c21 (Fvertical_motion): Include composition in the case of
Kenichi Handa <handa@m17n.org>
parents: 73140
diff changeset
2093 composition, or Lisp string. We won't need to backtrack in
4cb12ab18c21 (Fvertical_motion): Include composition in the case of
Kenichi Handa <handa@m17n.org>
parents: 73140
diff changeset
2094 this situation, except for one corner case: when the Lisp
4cb12ab18c21 (Fvertical_motion): Include composition in the case of
Kenichi Handa <handa@m17n.org>
parents: 73140
diff changeset
2095 string contains a newline. */
73140
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2096 if (it.method == GET_FROM_STRING)
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2097 {
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2098 const char *s = SDATA (it.string);
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2099 const char *e = s + SBYTES (it.string);
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2100
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2101 while (s < e && *s != '\n')
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2102 ++s;
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2103
75105
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2104 /* If there is no newline in the string, we need to check
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2105 whether there is a newline immediately after the string
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2106 in move_it_to below. This may happen if there is an
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2107 overlay with an after-string just before the newline. */
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2108 it_overshoot_expected = (s == e) ? -1 : 0;
73140
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2109 }
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2110 else
75105
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2111 it_overshoot_expected = (it.method == GET_FROM_IMAGE
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2112 || it.method == GET_FROM_STRETCH
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2113 || it.method == GET_FROM_COMPOSITION);
73140
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2114
58308
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2115 reseat_at_previous_visible_line_start (&it);
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2116 it.current_x = it.hpos = 0;
59647
7d7e154e3e7a (Fvertical_motion): Temporarily disable selective display.
Kim F. Storm <storm@cua.dk>
parents: 58909
diff changeset
2117 /* Temporarily disable selective display so we don't move too far */
7d7e154e3e7a (Fvertical_motion): Temporarily disable selective display.
Kim F. Storm <storm@cua.dk>
parents: 58909
diff changeset
2118 oselective = it.selective;
7d7e154e3e7a (Fvertical_motion): Temporarily disable selective display.
Kim F. Storm <storm@cua.dk>
parents: 58909
diff changeset
2119 it.selective = 0;
58308
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2120 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
59647
7d7e154e3e7a (Fvertical_motion): Temporarily disable selective display.
Kim F. Storm <storm@cua.dk>
parents: 58909
diff changeset
2121 it.selective = oselective;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
2122
58308
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2123 /* Move back if we got too far. This may happen if
64282
769e8d799acf (Fvertical_motion): If start position is on an image,
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
2124 truncate-lines is on and PT is beyond right margin.
73140
c85ee72ad64b * indent.c (Fvertical_motion): Do move back if the Lisp string
Chong Yidong <cyd@stupidchicken.com>
parents: 72885
diff changeset
2125 Don't go back if the overshoot is expected (see above). */
67421
a405a1787bef From: Kyotaro HORIGUCHI (tiny change)
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
2126 if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
75105
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2127 && (!it_overshoot_expected
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2128 || (it_overshoot_expected < 0
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2129 && it.method == GET_FROM_BUFFER
ce5dc7ec8f3d (Fvertical_motion): Fix IT overshoot check for overlay
Kim F. Storm <storm@cua.dk>
parents: 74091
diff changeset
2130 && it.c == '\n')))
58308
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2131 move_it_by_lines (&it, -1, 0);
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2132
5358f62b0795 (Fvertical_motion): Undo 2004-11-16 change.
Kim F. Storm <storm@cua.dk>
parents: 58270
diff changeset
2133 it.vpos = 0;
58909
e3754638899a (Fvertical_motion): Call move_it_by_lines even if LINES = 0.
Richard M. Stallman <rms@gnu.org>
parents: 58451
diff changeset
2134 /* Do this even if LINES is 0, so that we move back
e3754638899a (Fvertical_motion): Call move_it_by_lines even if LINES = 0.
Richard M. Stallman <rms@gnu.org>
parents: 58451
diff changeset
2135 to the beginning of the current line as we ought. */
69103
98dc9c749829 (Fvertical_motion): Only try to move back if we can.
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
2136 if (XINT (lines) >= 0 || IT_CHARPOS (it) > 0)
98dc9c749829 (Fvertical_motion): Only try to move back if we can.
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
2137 move_it_by_lines (&it, XINT (lines), 0);
58270
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2138
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2139 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
1bc0c9f25148 (Fvertical_motion): In batch mode, use vmotion directly.
Richard M. Stallman <rms@gnu.org>
parents: 58260
diff changeset
2140 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2141
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2142 if (BUFFERP (old_buffer))
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2143 w->buffer = old_buffer;
45622
ff3b6311d00f (last_known_column): Now a float.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44839
diff changeset
2144
28293
14eccbd25cae (Fvertical_motion): Always use the current buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 26859
diff changeset
2145 RETURN_UNGCPRO (make_number (it.vpos));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146 }
25028
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2147
ab513f624bc6 (Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24828
diff changeset
2148
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2149
36846
89efd94a5832 (current_column, current_column_1, Fmove_to_column)
Gerd Moellmann <gerd@gnu.org>
parents: 35405
diff changeset
2150 /* File's initialization. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
2151
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21496
diff changeset
2152 void
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2153 syms_of_indent ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2154 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2155 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2156 doc: /* *Indentation can insert tabs if this is non-nil.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
2157 Setting this variable automatically makes it local to the current buffer. */);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2158 indent_tabs_mode = 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2159
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2160 defsubr (&Scurrent_indentation);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2161 defsubr (&Sindent_to);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2162 defsubr (&Scurrent_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2163 defsubr (&Smove_to_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2164 defsubr (&Svertical_motion);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
2165 defsubr (&Scompute_motion);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2166 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51838
diff changeset
2167
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51838
diff changeset
2168 /* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51838
diff changeset
2169 (do not change this comment) */