Mercurial > hg > xemacs-beta
comparison src/extents.h @ 5118:e0db3c197671 ben-lisp-object
merge up to latest default branch, doesn't compile yet
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 26 Dec 2009 21:18:49 -0600 |
parents | 257b468bf2ca |
children | a9c41067dd88 |
comparison
equal
deleted
inserted
replaced
5117:3742ea8250b5 | 5118:e0db3c197671 |
---|---|
21 /* Synched up with: Not in FSF. */ | 21 /* Synched up with: Not in FSF. */ |
22 | 22 |
23 #ifndef INCLUDED_extents_h_ | 23 #ifndef INCLUDED_extents_h_ |
24 #define INCLUDED_extents_h_ | 24 #define INCLUDED_extents_h_ |
25 | 25 |
26 DECLARE_LRECORD (extent, struct extent); | 26 DECLARE_LISP_OBJECT (extent, struct extent); |
27 #define XEXTENT(x) XRECORD (x, extent, struct extent) | 27 #define XEXTENT(x) XRECORD (x, extent, struct extent) |
28 #define wrap_extent(p) wrap_record (p, extent) | 28 #define wrap_extent(p) wrap_record (p, extent) |
29 #define EXTENTP(x) RECORDP (x, extent) | 29 #define EXTENTP(x) RECORDP (x, extent) |
30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent) | 30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent) |
31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent) | 31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent) |
32 | 32 |
33 struct extent_auxiliary; | 33 struct extent_auxiliary; |
34 | 34 |
35 DECLARE_LRECORD (extent_auxiliary, struct extent_auxiliary); | 35 DECLARE_LISP_OBJECT (extent_auxiliary, struct extent_auxiliary); |
36 #define XEXTENT_AUXILIARY(x) \ | 36 #define XEXTENT_AUXILIARY(x) \ |
37 XRECORD (x, extent_auxiliary, struct extent_auxiliary) | 37 XRECORD (x, extent_auxiliary, struct extent_auxiliary) |
38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary) | 38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary) |
39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary) | 39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary) |
40 #define CHECK_EXTENT_AUXILIARY(x) CHECK_RECORD (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) | 41 #define CONCHECK_EXTENT_AUXILIARY(x) CONCHECK_RECORD (x, extent_auxiliary) |
42 | 42 |
43 struct extent_info; | 43 struct extent_info; |
44 | 44 |
45 DECLARE_LRECORD (extent_info, struct extent_info); | 45 DECLARE_LISP_OBJECT (extent_info, struct extent_info); |
46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info) | 46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info) |
47 #define wrap_extent_info(p) wrap_record (p, extent_info) | 47 #define wrap_extent_info(p) wrap_record (p, extent_info) |
48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) | 48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) |
49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (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) | 50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) |
51 | |
52 #ifdef NEW_GC | |
53 struct gap_array_marker; | |
54 | |
55 DECLARE_LISP_OBJECT (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_LISP_OBJECT (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_LISP_OBJECT (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_LISP_OBJECT (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_LISP_OBJECT (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 */ | |
51 | 101 |
52 /* the layouts for glyphs (extent->flags.glyph_layout). Must fit in 2 bits. */ | 102 /* the layouts for glyphs (extent->flags.glyph_layout). Must fit in 2 bits. */ |
53 typedef enum glyph_layout | 103 typedef enum glyph_layout |
54 { | 104 { |
55 GL_TEXT, | 105 GL_TEXT, |
95 | 145 |
96 | 146 |
97 extern int inside_undo; | 147 extern int inside_undo; |
98 extern int in_modeline_generation; | 148 extern int in_modeline_generation; |
99 | 149 |
150 extern Fixnum mouse_highlight_priority; | |
151 | |
100 EXFUN (Fextent_at, 5); | 152 EXFUN (Fextent_at, 5); |
101 EXFUN (Fextent_property, 3); | 153 EXFUN (Fextent_property, 3); |
102 EXFUN (Fput_text_property, 5); | 154 EXFUN (Fput_text_property, 5); |
103 | 155 |
104 EXFUN (Fdetach_extent, 1); | 156 EXFUN (Fdetach_extent, 1); |
112 EXFUN (Fprevious_extent_change, 2); | 164 EXFUN (Fprevious_extent_change, 2); |
113 EXFUN (Fprevious_single_char_property_change, 4); | 165 EXFUN (Fprevious_single_char_property_change, 4); |
114 EXFUN (Fset_extent_endpoints, 4); | 166 EXFUN (Fset_extent_endpoints, 4); |
115 EXFUN (Fset_extent_parent, 2); | 167 EXFUN (Fset_extent_parent, 2); |
116 EXFUN (Fset_extent_property, 3); | 168 EXFUN (Fset_extent_property, 3); |
169 EXFUN (Fset_extent_priority, 2); | |
170 EXFUN (Fset_extent_face, 2); | |
171 EXFUN (Fmap_extents, 8); | |
117 | 172 |
118 enum extent_at_flag | 173 enum extent_at_flag |
119 { | 174 { |
120 EXTENT_AT_DEFAULT = 0, | 175 EXTENT_AT_DEFAULT = 0, |
121 EXTENT_AT_AFTER = 0, | 176 EXTENT_AT_AFTER = 0, |