Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 647:b39c14581166

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents 373ced43e288
children fdefd0186b75
comparison
equal deleted inserted replaced
646:00c54252fe4f 647:b39c14581166
773 add_hscroll_rune (pos_data *data) 773 add_hscroll_rune (pos_data *data)
774 { 774 {
775 struct glyph_block gb; 775 struct glyph_block gb;
776 prop_block_dynarr *retval; 776 prop_block_dynarr *retval;
777 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos; 777 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
778 unsigned int old_cursor_type = data->cursor_type; 778 int old_cursor_type = data->cursor_type;
779 Bytind bi_old_bufpos = data->bi_bufpos; 779 Bytind bi_old_bufpos = data->bi_bufpos;
780 780
781 if (data->cursor_type == CURSOR_ON 781 if (data->cursor_type == CURSOR_ON
782 && data->bi_cursor_bufpos >= data->bi_start_col_enabled 782 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
783 && data->bi_cursor_bufpos <= data->bi_bufpos) 783 && data->bi_cursor_bufpos <= data->bi_bufpos)
1111 static prop_block_dynarr * 1111 static prop_block_dynarr *
1112 add_octal_runes (pos_data *data) 1112 add_octal_runes (pos_data *data)
1113 { 1113 {
1114 prop_block_dynarr *prop, *add_failed; 1114 prop_block_dynarr *prop, *add_failed;
1115 Emchar orig_char = data->ch; 1115 Emchar orig_char = data->ch;
1116 unsigned int orig_cursor_type = data->cursor_type; 1116 int orig_cursor_type = data->cursor_type;
1117 1117
1118 /* Initialize */ 1118 /* Initialize */
1119 prop = NULL; 1119 prop = NULL;
1120 add_failed = NULL; 1120 add_failed = NULL;
1121 1121
1188 { 1188 {
1189 if (!NILP (b->ctl_arrow)) 1189 if (!NILP (b->ctl_arrow))
1190 { 1190 {
1191 prop_block_dynarr *prop; 1191 prop_block_dynarr *prop;
1192 Emchar orig_char = data->ch; 1192 Emchar orig_char = data->ch;
1193 unsigned int old_cursor_type = data->cursor_type; 1193 int old_cursor_type = data->cursor_type;
1194 1194
1195 /* Initialize */ 1195 /* Initialize */
1196 prop = NULL; 1196 prop = NULL;
1197 1197
1198 if (data->start_col) 1198 if (data->start_col)
1380 This is seriously fucked! Seven ####'s in 130 lines -- is that a 1380 This is seriously fucked! Seven ####'s in 130 lines -- is that a
1381 record? */ 1381 record? */
1382 int elt; 1382 int elt;
1383 prop_block_dynarr *add_failed; 1383 prop_block_dynarr *add_failed;
1384 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos; 1384 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
1385 unsigned int old_cursor_type = data->cursor_type; 1385 int old_cursor_type = data->cursor_type;
1386 1386
1387 for (elt = 0; elt < Dynarr_length (*prop); elt++) 1387 for (elt = 0; elt < Dynarr_length (*prop); elt++)
1388 { 1388 {
1389 struct prop_block *pb = Dynarr_atp (*prop, elt); 1389 struct prop_block *pb = Dynarr_atp (*prop, elt);
1390 1390
5951 startp = BUF_ZV (b); 5951 startp = BUF_ZV (b);
5952 } 5952 }
5953 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer); 5953 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
5954 5954
5955 truncation_changed = (find_window_mirror (w)->truncate_win != 5955 truncation_changed = (find_window_mirror (w)->truncate_win !=
5956 window_truncation_on (w)); 5956 (unsigned int) window_truncation_on (w));
5957 5957
5958 /* If w->force_start is set, then some function set w->start and we 5958 /* If w->force_start is set, then some function set w->start and we
5959 should display from there and change point, if necessary, to 5959 should display from there and change point, if necessary, to
5960 ensure that it is visible. */ 5960 ensure that it is visible. */
5961 if (w->force_start || inactive_minibuffer) 5961 if (w->force_start || inactive_minibuffer)
7244 int 7244 int
7245 point_in_line_start_cache (struct window *w, Bufpos point, int min_past) 7245 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
7246 { 7246 {
7247 struct buffer *b = XBUFFER (w->buffer); 7247 struct buffer *b = XBUFFER (w->buffer);
7248 line_start_cache_dynarr *cache = w->line_start_cache; 7248 line_start_cache_dynarr *cache = w->line_start_cache;
7249 unsigned int top, bottom, pos; 7249 int top, bottom, pos;
7250 7250
7251 validate_line_start_cache (w); 7251 validate_line_start_cache (w);
7252 w->line_cache_validation_override++; 7252 w->line_cache_validation_override++;
7253 7253
7254 /* Let functions pass in negative values, but we still treat -1 7254 /* Let functions pass in negative values, but we still treat -1
7372 top = Dynarr_length (cache) - 1; 7372 top = Dynarr_length (cache) - 1;
7373 bottom = 0; 7373 bottom = 0;
7374 7374
7375 while (1) 7375 while (1)
7376 { 7376 {
7377 unsigned int new_pos; 7377 int new_pos;
7378 Bufpos start, end; 7378 Bufpos start, end;
7379 7379
7380 pos = (bottom + top + 1) >> 1; 7380 pos = (bottom + top + 1) >> 1;
7381 start = Dynarr_atp (cache, pos)->start; 7381 start = Dynarr_atp (cache, pos)->start;
7382 end = Dynarr_atp (cache, pos)->end; 7382 end = Dynarr_atp (cache, pos)->end;
8098 { 8098 {
8099 struct display_line *dl = Dynarr_atp (dla, char_y + modeline); 8099 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
8100 struct display_block *db = get_display_block_from_line (dl, TEXT); 8100 struct display_block *db = get_display_block_from_line (dl, TEXT);
8101 8101
8102 *pix_y = (dl->ypos - dl->ascent + 8102 *pix_y = (dl->ypos - dl->ascent +
8103 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1)); 8103 ((dl->ascent + dl->descent - dl->clip) >> 1));
8104 8104
8105 if (char_x < Dynarr_length (db->runes)) 8105 if (char_x < Dynarr_length (db->runes))
8106 { 8106 {
8107 struct rune *rb = Dynarr_atp (db->runes, char_x); 8107 struct rune *rb = Dynarr_atp (db->runes, char_x);
8108 8108