comparison src/redisplay-output.c @ 4967:0d4c9d0f6a8d

rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents 8b63e21b0436
children 9410323e4b0d c3cc3fa503a2
comparison
equal deleted inserted replaced
4966:48b63cd88a21 4967:0d4c9d0f6a8d
81 /* #### Doing this directly breaks the encapsulation. But, the 81 /* #### Doing this directly breaks the encapsulation. But, the
82 running time of this function has a measurable impact on 82 running time of this function has a measurable impact on
83 redisplay performance so avoiding all excess overhead is a 83 redisplay performance so avoiding all excess overhead is a
84 good thing. Is all of this true? */ 84 good thing. Is all of this true? */
85 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move); 85 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move);
86 Dynarr_set_size (cra, max_move); 86 Dynarr_set_length (cra, max_move);
87 } 87 }
88 else 88 else
89 Dynarr_reset (cra); 89 Dynarr_reset (cra);
90 90
91 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++) 91 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++)
716 which rune in the TEXT block contains the cursor. This means 716 which rune in the TEXT block contains the cursor. This means
717 that there must be at least one display block. The TEXT 717 that there must be at least one display block. The TEXT
718 block, if present, must always be the first display block. */ 718 block, if present, must always be the first display block. */
719 assert (Dynarr_length (ddba) != 0); 719 assert (Dynarr_length (ddba) != 0);
720 720
721 db = Dynarr_atp (ddba, 0); 721 db = Dynarr_begin (ddba);
722 assert (db->type == TEXT); 722 assert (db->type == TEXT);
723 723
724 get_cursor_size_and_location (w, db, ddl->cursor_elt, &cursor_start, 724 get_cursor_size_and_location (w, db, ddl->cursor_elt, &cursor_start,
725 &cursor_width, &cursor_height); 725 &cursor_width, &cursor_height);
726 } 726 }
1027 { 1027 {
1028 w->last_point_x[CURRENT_DISP] = 0; 1028 w->last_point_x[CURRENT_DISP] = 0;
1029 w->last_point_y[CURRENT_DISP] = y; 1029 w->last_point_y[CURRENT_DISP] = y;
1030 Fset_marker (w->last_point[CURRENT_DISP], Qzero, w->buffer); 1030 Fset_marker (w->last_point[CURRENT_DISP], Qzero, w->buffer);
1031 1031
1032 rb = Dynarr_atp (db->runes, 0); 1032 rb = Dynarr_begin (db->runes);
1033 rb->cursor_type = CURSOR_ON; 1033 rb->cursor_type = CURSOR_ON;
1034 dl->cursor_elt = 0; 1034 dl->cursor_elt = 0;
1035 1035
1036 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width); 1036 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width);
1037 1037
2194 ypos2 += window_scrollbar_height (w); 2194 ypos2 += window_scrollbar_height (w);
2195 #endif 2195 #endif
2196 2196
2197 if (ddla_len) 2197 if (ddla_len)
2198 { 2198 {
2199 if (ddla_len == 1 && Dynarr_atp (ddla, 0)->modeline) 2199 if (ddla_len == 1 && Dynarr_begin (ddla)->modeline)
2200 { 2200 {
2201 ypos1 = WINDOW_TEXT_TOP (w); 2201 ypos1 = WINDOW_TEXT_TOP (w);
2202 #ifdef HAVE_SCROLLBARS 2202 #ifdef HAVE_SCROLLBARS
2203 /* This adjustment is to catch the intersection of any scrollbars. */ 2203 /* This adjustment is to catch the intersection of any scrollbars. */
2204 if (f->windows_structure_changed && !NILP (w->scrollbar_on_top_p)) 2204 if (f->windows_structure_changed && !NILP (w->scrollbar_on_top_p))
2396 if (!need_to_clear_bottom) 2396 if (!need_to_clear_bottom)
2397 { 2397 {
2398 cdl = ddl = 0; 2398 cdl = ddl = 0;
2399 2399
2400 if (cdla_len) 2400 if (cdla_len)
2401 cdl = Dynarr_atp (cdla, 0); 2401 cdl = Dynarr_begin (cdla);
2402 if (ddla_len) 2402 if (ddla_len)
2403 ddl = Dynarr_atp (ddla, 0); 2403 ddl = Dynarr_begin (ddla);
2404 2404
2405 if (!cdl || !ddl) 2405 if (!cdl || !ddl)
2406 need_to_clear_bottom = 1; 2406 need_to_clear_bottom = 1;
2407 else if ((!cdl->modeline && ddl->modeline) 2407 else if ((!cdl->modeline && ddl->modeline)
2408 || (cdl->modeline && !ddl->modeline)) 2408 || (cdl->modeline && !ddl->modeline))
2462 } 2462 }
2463 2463
2464 /* If the number of display lines has shrunk, adjust. */ 2464 /* If the number of display lines has shrunk, adjust. */
2465 if (cdla_len > ddla_len) 2465 if (cdla_len > ddla_len)
2466 { 2466 {
2467 Dynarr_length (cdla) = ddla_len; 2467 Dynarr_set_length (cdla, ddla_len);
2468 } 2468 }
2469 2469
2470 /* Output a vertical divider between windows, if necessary. */ 2470 /* Output a vertical divider between windows, if necessary. */
2471 if (window_needs_vertical_divider (w) 2471 if (window_needs_vertical_divider (w)
2472 && (f->windows_structure_changed || f->clear)) 2472 && (f->windows_structure_changed || f->clear))