Mercurial > hg > xemacs-beta
annotate src/extents.h @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 141c2920ea48 |
| children | e0db3c197671 |
| rev | line source |
|---|---|
| 428 | 1 /* Copyright (c) 1994, 1995 Free Software Foundation. |
| 872 | 2 Copyright (c) 1995, 1996, 2002 Ben Wing. |
| 428 | 3 |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_extents_h_ |
| 24 #define INCLUDED_extents_h_ | |
| 428 | 25 |
| 26 DECLARE_LRECORD (extent, struct extent); | |
| 27 #define XEXTENT(x) XRECORD (x, extent, struct extent) | |
| 617 | 28 #define wrap_extent(p) wrap_record (p, extent) |
| 428 | 29 #define EXTENTP(x) RECORDP (x, extent) |
| 30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent) | |
| 31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent) | |
| 32 | |
| 872 | 33 struct extent_auxiliary; |
| 428 | 34 |
| 35 DECLARE_LRECORD (extent_auxiliary, struct extent_auxiliary); | |
| 36 #define XEXTENT_AUXILIARY(x) \ | |
| 37 XRECORD (x, extent_auxiliary, struct extent_auxiliary) | |
| 617 | 38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary) |
| 428 | 39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary) |
| 40 #define CHECK_EXTENT_AUXILIARY(x) CHECK_RECORD (x, extent_auxiliary) | |
| 41 #define CONCHECK_EXTENT_AUXILIARY(x) CONCHECK_RECORD (x, extent_auxiliary) | |
| 42 | |
| 872 | 43 struct extent_info; |
| 428 | 44 |
| 45 DECLARE_LRECORD (extent_info, struct extent_info); | |
| 46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info) | |
| 617 | 47 #define wrap_extent_info(p) wrap_record (p, extent_info) |
| 428 | 48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) |
| 49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info) | |
| 50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) | |
| 51 | |
| 3092 | 52 #ifdef NEW_GC |
| 53 struct gap_array_marker; | |
| 54 | |
| 55 DECLARE_LRECORD (gap_array_marker, struct gap_array_marker); | |
| 56 #define XGAP_ARRAY_MARKER(x) \ | |
| 57 XRECORD (x, gap_array_marker, struct gap_array_marker) | |
| 58 #define wrap_gap_array_marker(p) wrap_record (p, gap_array_marker) | |
| 59 #define GAP_ARRAY_MARKERP(x) RECORDP (x, gap_array_marker) | |
| 60 #define CHECK_GAP_ARRAY_MARKER(x) CHECK_RECORD (x, gap_array_marker) | |
| 61 #define CONCHECK_GAP_ARRAY_MARKER(x) CONCHECK_RECORD (x, gap_array_marker) | |
| 62 | |
| 63 struct gap_array; | |
| 64 | |
| 65 DECLARE_LRECORD (gap_array, struct gap_array); | |
| 66 #define XGAP_ARRAY(x) XRECORD (x, gap_array, struct gap_array) | |
| 67 #define wrap_gap_array(p) wrap_record (p, gap_array) | |
| 68 #define GAP_ARRAYP(x) RECORDP (x, gap_array) | |
| 69 #define CHECK_GAP_ARRAY(x) CHECK_RECORD (x, gap_array) | |
| 70 #define CONCHECK_GAP_ARRAY(x) CONCHECK_RECORD (x, gap_array) | |
| 71 | |
| 72 struct extent_list_marker; | |
| 73 | |
| 74 DECLARE_LRECORD (extent_list_marker, struct extent_list_marker); | |
| 75 #define XEXTENT_LIST_MARKER(x) \ | |
| 76 XRECORD (x, extent_list_marker, struct extent_list_marker) | |
| 77 #define wrap_extent_list_marker(p) wrap_record (p, extent_list_marker) | |
| 78 #define EXTENT_LIST_MARKERP(x) RECORDP (x, extent_list_marker) | |
| 79 #define CHECK_EXTENT_LIST_MARKER(x) CHECK_RECORD (x, extent_list_marker) | |
| 80 #define CONCHECK_EXTENT_LIST_MARKER(x) CONCHECK_RECORD (x, extent_list_marker) | |
| 81 | |
| 82 struct extent_list; | |
| 83 | |
| 84 DECLARE_LRECORD (extent_list, struct extent_list); | |
| 85 #define XEXTENT_LIST(x) XRECORD (x, extent_list, struct extent_list) | |
| 86 #define wrap_extent_list(p) wrap_record (p, extent_list) | |
| 87 #define EXTENT_LISTP(x) RECORDP (x, extent_list) | |
| 88 #define CHECK_EXTENT_LIST(x) CHECK_RECORD (x, extent_list) | |
| 89 #define CONCHECK_EXTENT_LIST(x) CONCHECK_RECORD (x, extent_list) | |
| 90 | |
| 91 struct stack_of_extents; | |
| 92 | |
| 93 DECLARE_LRECORD (stack_of_extents, struct stack_of_extents); | |
| 94 #define XSTACK_OF_EXTENTS(x) \ | |
| 95 XRECORD (x, stack_of_extents, struct stack_of_extents) | |
| 96 #define wrap_stack_of_extents(p) wrap_record (p, stack_of_extents) | |
| 97 #define STACK_OF_EXTENTSP(x) RECORDP (x, stack_of_extents) | |
| 98 #define CHECK_STACK_OF_EXTENTS(x) CHECK_RECORD (x, stack_of_extents) | |
| 99 #define CONCHECK_STACK_OF_EXTENTS(x) CONCHECK_RECORD (x, stack_of_extents) | |
| 100 #endif /* NEW_GC */ | |
| 101 | |
| 872 | 102 /* the layouts for glyphs (extent->flags.glyph_layout). Must fit in 2 bits. */ |
| 103 typedef enum glyph_layout | |
| 826 | 104 { |
| 872 | 105 GL_TEXT, |
| 106 GL_OUTSIDE_MARGIN, | |
| 107 GL_INSIDE_MARGIN, | |
| 108 GL_WHITESPACE | |
| 109 } glyph_layout; | |
| 428 | 110 |
| 872 | 111 struct extent; |
| 428 | 112 |
| 872 | 113 void set_extent_endpoints (EXTENT extent, Bytexpos s, Bytexpos e, |
| 114 Lisp_Object object); | |
| 428 | 115 |
| 872 | 116 |
| 117 void flush_cached_extent_info (Lisp_Object extent_info); | |
| 647 | 118 |
| 826 | 119 void set_extent_glyph (EXTENT extent, Lisp_Object glyph, int endp, |
| 120 glyph_layout layout); | |
| 121 | |
| 428 | 122 |
| 123 /* flags for map_extents() and friends */ | |
| 124 #define ME_END_CLOSED (1 << 0) | |
| 125 #define ME_START_OPEN (1 << 1) | |
| 126 #define ME_ALL_EXTENTS_CLOSED (1 << 2) | |
| 127 #define ME_ALL_EXTENTS_OPEN (2 << 2) | |
| 128 #define ME_ALL_EXTENTS_CLOSED_OPEN (3 << 2) | |
| 129 #define ME_ALL_EXTENTS_OPEN_CLOSED (4 << 2) | |
| 130 #define ME_ALL_EXTENTS_MASK (7 << 2) | |
| 131 #define ME_START_IN_REGION (1 << 5) | |
| 132 #define ME_END_IN_REGION (2 << 5) | |
| 133 #define ME_START_AND_END_IN_REGION (3 << 5) | |
| 134 #define ME_START_OR_END_IN_REGION (4 << 5) | |
| 135 #define ME_IN_REGION_MASK (7 << 5) | |
| 136 #define ME_NEGATE_IN_REGION (1 << 8) | |
| 137 /* the following flags are internal-only */ | |
| 138 #define ME_INCLUDE_INTERNAL (1 << 9) | |
| 139 #define ME_MIGHT_THROW (1 << 10) | |
| 140 #define ME_MIGHT_MODIFY_TEXT (1 << 11) | |
| 141 #define ME_MIGHT_MODIFY_EXTENTS (1 << 12) | |
| 142 #define ME_MIGHT_MOVE_SOE (1 << 13) | |
| 143 #define ME_MIGHT_CALL_ELISP (ME_MIGHT_THROW | ME_MIGHT_MODIFY_TEXT | \ | |
| 144 ME_MIGHT_MODIFY_EXTENTS | ME_MIGHT_MOVE_SOE) | |
| 145 | |
| 146 | |
| 147 extern int inside_undo; | |
| 442 | 148 extern int in_modeline_generation; |
| 428 | 149 |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
150 extern Fixnum mouse_highlight_priority; |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
151 |
| 872 | 152 EXFUN (Fextent_at, 5); |
| 153 EXFUN (Fextent_property, 3); | |
| 154 EXFUN (Fput_text_property, 5); | |
| 155 | |
| 156 EXFUN (Fdetach_extent, 1); | |
| 157 EXFUN (Fextent_end_position, 1); | |
| 158 EXFUN (Fextent_object, 1); | |
| 159 EXFUN (Fextent_properties, 1); | |
| 160 EXFUN (Fextent_start_position, 1); | |
| 161 EXFUN (Fget_char_property, 4); | |
| 162 EXFUN (Fmake_extent, 3); | |
| 163 EXFUN (Fnext_extent_change, 2); | |
| 164 EXFUN (Fprevious_extent_change, 2); | |
| 2506 | 165 EXFUN (Fprevious_single_char_property_change, 4); |
| 872 | 166 EXFUN (Fset_extent_endpoints, 4); |
| 167 EXFUN (Fset_extent_parent, 2); | |
| 168 EXFUN (Fset_extent_property, 3); | |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
169 EXFUN (Fset_extent_priority, 2); |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
170 EXFUN (Fset_extent_face, 2); |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
171 EXFUN (Fmap_extents, 8); |
| 872 | 172 |
| 173 enum extent_at_flag | |
| 174 { | |
| 175 EXTENT_AT_DEFAULT = 0, | |
| 176 EXTENT_AT_AFTER = 0, | |
| 177 EXTENT_AT_BEFORE, | |
| 178 EXTENT_AT_AT | |
| 179 }; | |
| 180 | |
| 181 Bytexpos extent_endpoint_byte (EXTENT extent, int endp); | |
| 182 Charxpos extent_endpoint_char (EXTENT extent, int endp); | |
| 2506 | 183 Bytexpos next_previous_single_property_change (Bytexpos pos, Lisp_Object prop, |
| 184 Lisp_Object object, | |
| 185 Bytexpos limit, | |
| 186 Boolint next, | |
| 187 Boolint text_props_only); | |
| 872 | 188 Lisp_Object get_char_property (Bytexpos position, Lisp_Object prop, |
| 189 Lisp_Object object, enum extent_at_flag fl, | |
| 190 int text_props_only); | |
| 191 void adjust_extents (Lisp_Object object, Memxpos from, | |
| 192 Memxpos to, int amount); | |
| 193 void adjust_extents_for_deletion (Lisp_Object object, Bytexpos from, | |
| 194 Bytexpos to, int gapsize, | |
| 195 int numdel, int movegapsize); | |
| 196 void verify_extent_modification (Lisp_Object object, Bytexpos from, | |
| 197 Bytexpos to, | |
| 198 Lisp_Object inhibit_read_only_value); | |
| 199 void process_extents_for_insertion (Lisp_Object object, | |
| 200 Bytexpos opoint, Bytecount length); | |
| 201 void process_extents_for_deletion (Lisp_Object object, Bytexpos from, | |
| 202 Bytexpos to, int destroy_them); | |
| 203 /* Note the following function is in Charbpos's */ | |
| 204 void report_extent_modification (Lisp_Object buffer, Charbpos start, | |
| 205 Charbpos end, int afterp); | |
| 206 void add_string_extents (Lisp_Object string, struct buffer *buf, | |
| 207 Bytexpos opoint, Bytecount length); | |
| 208 void splice_in_string_extents (Lisp_Object string, struct buffer *buf, | |
| 209 Bytexpos opoint, Bytecount length, | |
| 210 Bytecount pos); | |
| 211 void copy_string_extents (Lisp_Object new_string, | |
| 212 Lisp_Object old_string, | |
| 213 Bytecount new_pos, Bytecount old_pos, | |
| 214 Bytecount length); | |
| 215 void detach_all_extents (Lisp_Object object); | |
| 216 Lisp_Object extent_at (Bytexpos position, Lisp_Object object, | |
| 217 Lisp_Object property, EXTENT before, | |
| 218 enum extent_at_flag at_flag, int all_extents); | |
| 219 | |
| 220 | |
| 428 | 221 struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string, |
| 222 struct frame *frm); | |
| 223 face_index extent_fragment_update (struct window *w, | |
| 224 struct extent_fragment *ef, | |
| 826 | 225 Bytexpos pos, Lisp_Object last_glyph); |
| 428 | 226 void extent_fragment_delete (struct extent_fragment *ef); |
| 227 | |
| 228 /* from alloc.c */ | |
| 229 struct extent *allocate_extent (void); | |
| 230 | |
| 231 void allocate_extent_auxiliary (EXTENT ext); | |
| 232 void init_buffer_extents (struct buffer *b); | |
| 233 void uninit_buffer_extents (struct buffer *b); | |
| 234 | |
| 235 #ifdef ERROR_CHECK_EXTENTS | |
| 236 void sledgehammer_extent_check (Lisp_Object obj); | |
| 237 #endif | |
| 238 | |
| 239 #ifdef MEMORY_USAGE_STATS | |
| 240 int compute_buffer_extent_usage (struct buffer *b, | |
| 241 struct overhead_stats *ovstats); | |
| 242 #endif | |
| 243 | |
| 440 | 244 #endif /* INCLUDED_extents_h_ */ |