Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 2552:166ed8151e62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-02-03 16:30:33 by james] Don't define this to c_this, and rename variables currently named this. See xemacs-patches message with ID <psbrb1ehjl.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 16:30:38 +0000
parents 9f70af3ac939
children facf3239ba30
comparison
equal deleted inserted replaced
2551:9f70af3ac939 2552:166ed8151e62
4104 if (STRINGP (elt)) 4104 if (STRINGP (elt))
4105 { 4105 {
4106 /* A string. Add to the display line and check for %-constructs 4106 /* A string. Add to the display line and check for %-constructs
4107 within it. */ 4107 within it. */
4108 4108
4109 Ibyte *this = XSTRING_DATA (elt); 4109 Ibyte *this_str = XSTRING_DATA (elt);
4110 4110
4111 while ((pos < max_pos || max_pos == -1) && *this) 4111 while ((pos < max_pos || max_pos == -1) && *this_str)
4112 { 4112 {
4113 Ibyte *last = this; 4113 Ibyte *last = this_str;
4114 4114
4115 while (*this && *this != '%') 4115 while (*this_str && *this_str != '%')
4116 this++; 4116 this_str++;
4117 4117
4118 if (this != last) 4118 if (this_str != last)
4119 { 4119 {
4120 /* No %-construct */ 4120 /* No %-construct */
4121 Charcount size = 4121 Charcount size =
4122 bytecount_to_charcount (last, this - last); 4122 bytecount_to_charcount (last, this_str - last);
4123 4123
4124 if (size <= *offset) 4124 if (size <= *offset)
4125 *offset -= size; 4125 *offset -= size;
4126 else 4126 else
4127 { 4127 {
4132 pos = add_string_to_fstring_db_runes (data, tmp_last, 4132 pos = add_string_to_fstring_db_runes (data, tmp_last,
4133 pos, pos, tmp_max); 4133 pos, pos, tmp_max);
4134 *offset = 0; 4134 *offset = 0;
4135 } 4135 }
4136 } 4136 }
4137 else /* *this == '%' */ 4137 else /* *this_str == '%' */
4138 { 4138 {
4139 Charcount spec_width = 0; 4139 Charcount spec_width = 0;
4140 4140
4141 this++; /* skip over '%' */ 4141 this_str++; /* skip over '%' */
4142 4142
4143 /* We can't allow -ve args due to the "%-" construct. 4143 /* We can't allow -ve args due to the "%-" construct.
4144 * Argument specifies minwidth but not maxwidth 4144 * Argument specifies minwidth but not maxwidth
4145 * (maxwidth can be specified by 4145 * (maxwidth can be specified by
4146 * (<negative-number> . <stuff>) modeline elements) 4146 * (<negative-number> . <stuff>) modeline elements)
4147 */ 4147 */
4148 while (isdigit (*this)) 4148 while (isdigit (*this_str))
4149 { 4149 {
4150 spec_width = spec_width * 10 + (*this - '0'); 4150 spec_width = spec_width * 10 + (*this_str - '0');
4151 this++; 4151 this_str++;
4152 } 4152 }
4153 spec_width += pos; 4153 spec_width += pos;
4154 4154
4155 if (*this == 'M') 4155 if (*this_str == 'M')
4156 { 4156 {
4157 pos = generate_fstring_runes (w, data, pos, spec_width, 4157 pos = generate_fstring_runes (w, data, pos, spec_width,
4158 max_pos, Vglobal_mode_string, 4158 max_pos, Vglobal_mode_string,
4159 depth, max_pixsize, findex, 4159 depth, max_pixsize, findex,
4160 type, offset, cur_ext); 4160 type, offset, cur_ext);
4161 } 4161 }
4162 else if (*this == '-') 4162 else if (*this_str == '-')
4163 { 4163 {
4164 Charcount num_to_add; 4164 Charcount num_to_add;
4165 4165
4166 if (max_pixsize < 0) 4166 if (max_pixsize < 0)
4167 num_to_add = 0; 4167 num_to_add = 0;
4184 4184
4185 while (num_to_add--) 4185 while (num_to_add--)
4186 pos = add_string_to_fstring_db_runes 4186 pos = add_string_to_fstring_db_runes
4187 (data, (const Ibyte *) "-", pos, pos, max_pos); 4187 (data, (const Ibyte *) "-", pos, pos, max_pos);
4188 } 4188 }
4189 else if (*this != 0) 4189 else if (*this_str != 0)
4190 { 4190 {
4191 Ichar ch = itext_ichar (this); 4191 Ichar ch = itext_ichar (this_str);
4192 Ibyte *str; 4192 Ibyte *str;
4193 Charcount size; 4193 Charcount size;
4194 4194
4195 decode_mode_spec (w, ch, type); 4195 decode_mode_spec (w, ch, type);
4196 4196
4213 max_pos); 4213 max_pos);
4214 *offset = 0; 4214 *offset = 0;
4215 } 4215 }
4216 } 4216 }
4217 4217
4218 /* NOT this++. There could be any sort of character at 4218 /* NOT this_str++. There could be any sort of character at
4219 the current position. */ 4219 the current position. */
4220 INC_IBYTEPTR (this); 4220 INC_IBYTEPTR (this_str);
4221 } 4221 }
4222 4222
4223 if (max_pixsize > 0) 4223 if (max_pixsize > 0)
4224 { 4224 {
4225 int cur_pixsize; 4225 int cur_pixsize;