comparison src/dispextern.h @ 98236:1c3e02cbd63e

(struct it): Move line_wrap away from the middle of bitfields. Move voffset in struct iterator_stack_entry after the bitfields. Move tab_width near after another short.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 19 Sep 2008 03:35:56 +0000
parents 7b2adb63b556
children ab98984490b6
comparison
equal deleted inserted replaced
98235:eabb75a0a4b5 98236:1c3e02cbd63e
2040 unsigned string_from_display_prop_p : 1; 2040 unsigned string_from_display_prop_p : 1;
2041 unsigned display_ellipsis_p : 1; 2041 unsigned display_ellipsis_p : 1;
2042 unsigned avoid_cursor_p : 1; 2042 unsigned avoid_cursor_p : 1;
2043 2043
2044 /* properties from display property that are reset by another display property. */ 2044 /* properties from display property that are reset by another display property. */
2045 short voffset;
2045 Lisp_Object space_width; 2046 Lisp_Object space_width;
2046 Lisp_Object font_height; 2047 Lisp_Object font_height;
2047 short voffset;
2048 } 2048 }
2049 stack[IT_STACK_SIZE]; 2049 stack[IT_STACK_SIZE];
2050 2050
2051 /* Stack pointer. */ 2051 /* Stack pointer. */
2052 int sp; 2052 int sp;
2066 unsigned selective_display_ellipsis_p : 1; 2066 unsigned selective_display_ellipsis_p : 1;
2067 2067
2068 /* 1 means control characters are translated into the form `^C' 2068 /* 1 means control characters are translated into the form `^C'
2069 where the `^' can be replaced by a display table entry. */ 2069 where the `^' can be replaced by a display table entry. */
2070 unsigned ctl_arrow_p : 1; 2070 unsigned ctl_arrow_p : 1;
2071
2072 enum line_wrap_method line_wrap;
2073 2071
2074 /* Non-zero means that the current face has a box. */ 2072 /* Non-zero means that the current face has a box. */
2075 unsigned face_box_p : 1; 2073 unsigned face_box_p : 1;
2076 2074
2077 /* Non-null means that the current character is the first in a run 2075 /* Non-null means that the current character is the first in a run
2104 2102
2105 /* If 1, adjust current glyph so it does not increase current row 2103 /* If 1, adjust current glyph so it does not increase current row
2106 descent/ascent (line-height property). Reset after this glyph. */ 2104 descent/ascent (line-height property). Reset after this glyph. */
2107 unsigned constrain_row_ascent_descent_p : 1; 2105 unsigned constrain_row_ascent_descent_p : 1;
2108 2106
2107 enum line_wrap_method line_wrap;
2108
2109 /* The ID of the default face to use. One of DEFAULT_FACE_ID, 2109 /* The ID of the default face to use. One of DEFAULT_FACE_ID,
2110 MODE_LINE_FACE_ID, etc, depending on what we are displaying. */ 2110 MODE_LINE_FACE_ID, etc, depending on what we are displaying. */
2111 int base_face_id; 2111 int base_face_id;
2112 2112
2113 /* If what == IT_CHARACTER, character and length in bytes. This is 2113 /* If what == IT_CHARACTER, character and length in bytes. This is
2137 /* Value of the `space-width' property, if any; nil if none. */ 2137 /* Value of the `space-width' property, if any; nil if none. */
2138 Lisp_Object space_width; 2138 Lisp_Object space_width;
2139 2139
2140 /* Computed from the value of the `raise' property. */ 2140 /* Computed from the value of the `raise' property. */
2141 short voffset; 2141 short voffset;
2142
2143 /* Number of columns per \t. */
2144 short tab_width;
2142 2145
2143 /* Value of the `height' property, if any; nil if none. */ 2146 /* Value of the `height' property, if any; nil if none. */
2144 Lisp_Object font_height; 2147 Lisp_Object font_height;
2145 2148
2146 /* Object and position where the current display element came from. 2149 /* Object and position where the current display element came from.
2147 Object can be a Lisp string in case the current display element 2150 Object can be a Lisp string in case the current display element
2148 comes from an overlay string, or it is buffer. It may also be nil 2151 comes from an overlay string, or it is buffer. It may also be nil
2149 during mode-line update. Position is a position in object. */ 2152 during mode-line update. Position is a position in object. */
2150 Lisp_Object object; 2153 Lisp_Object object;
2151 struct text_pos position; 2154 struct text_pos position;
2152
2153 /* Number of columns per \t. */
2154 short tab_width;
2155 2155
2156 /* Width in pixels of truncation and continuation glyphs. */ 2156 /* Width in pixels of truncation and continuation glyphs. */
2157 short truncation_pixel_width, continuation_pixel_width; 2157 short truncation_pixel_width, continuation_pixel_width;
2158 2158
2159 /* First and last visible x-position in the display area. If window 2159 /* First and last visible x-position in the display area. If window