Mercurial > hg > xemacs-beta
comparison src/window.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 | 19a72041c5ed |
children | d0c14ea98592 6f2158fa75ed b5df3737028a |
comparison
equal
deleted
inserted
replaced
4966:48b63cd88a21 | 4967:0d4c9d0f6a8d |
---|---|
1123 up-to-date than CURRENT_DISP. For calls to this outside | 1123 up-to-date than CURRENT_DISP. For calls to this outside |
1124 of redisplay it doesn't matter which structure we check | 1124 of redisplay it doesn't matter which structure we check |
1125 since there is a redisplay condition that these | 1125 since there is a redisplay condition that these |
1126 structures be identical outside of redisplay. */ | 1126 structures be identical outside of redisplay. */ |
1127 dla = window_display_lines (w, DESIRED_DISP); | 1127 dla = window_display_lines (w, DESIRED_DISP); |
1128 if (dla && Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline) | 1128 if (dla && Dynarr_length (dla) && Dynarr_begin (dla)->modeline) |
1129 modeline_height = (Dynarr_atp (dla, 0)->ascent + | 1129 modeline_height = (Dynarr_begin (dla)->ascent + |
1130 Dynarr_atp (dla, 0)->descent); | 1130 Dynarr_begin (dla)->descent); |
1131 else | 1131 else |
1132 { | 1132 { |
1133 dla = window_display_lines (w, CURRENT_DISP); | 1133 dla = window_display_lines (w, CURRENT_DISP); |
1134 if (dla && Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline) | 1134 if (dla && Dynarr_length (dla) && Dynarr_begin (dla)->modeline) |
1135 modeline_height = (Dynarr_atp (dla, 0)->ascent + | 1135 modeline_height = (Dynarr_begin (dla)->ascent + |
1136 Dynarr_atp (dla, 0)->descent); | 1136 Dynarr_begin (dla)->descent); |
1137 else | 1137 else |
1138 /* This should be an abort except I'm not yet 100% | 1138 /* This should be an abort except I'm not yet 100% |
1139 confident that it won't ever get hit (though I | 1139 confident that it won't ever get hit (though I |
1140 haven't been able to trigger it). It is extremely | 1140 haven't been able to trigger it). It is extremely |
1141 unlikely to cause any noticeable problem and even if | 1141 unlikely to cause any noticeable problem and even if |
1921 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP); | 1921 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP); |
1922 int num_lines = Dynarr_length (dla); | 1922 int num_lines = Dynarr_length (dla); |
1923 struct display_line *dl; | 1923 struct display_line *dl; |
1924 | 1924 |
1925 /* No lines - no clipped lines */ | 1925 /* No lines - no clipped lines */ |
1926 if (num_lines == 0 || (num_lines == 1 && Dynarr_atp (dla, 0)->modeline)) | 1926 if (num_lines == 0 || (num_lines == 1 && Dynarr_begin (dla)->modeline)) |
1927 return Qnil; | 1927 return Qnil; |
1928 | 1928 |
1929 dl = Dynarr_atp (dla, num_lines - 1); | 1929 dl = Dynarr_atp (dla, num_lines - 1); |
1930 if (dl->clip == 0) | 1930 if (dl->clip == 0) |
1931 return Qnil; | 1931 return Qnil; |
4207 | 4207 |
4208 /* #### Document and assert somewhere that w->window_end_pos == -1 | 4208 /* #### Document and assert somewhere that w->window_end_pos == -1 |
4209 indicates that end-of-buffer is being displayed. */ | 4209 indicates that end-of-buffer is being displayed. */ |
4210 if (end_pos == -1) | 4210 if (end_pos == -1) |
4211 { | 4211 { |
4212 struct display_line *dl = Dynarr_atp (dla, 0); | 4212 struct display_line *dl = Dynarr_begin (dla); |
4213 int ypos1 = dl->ypos + dl->descent; | 4213 int ypos1 = dl->ypos + dl->descent; |
4214 int ypos2 = WINDOW_TEXT_BOTTOM (w); | 4214 int ypos2 = WINDOW_TEXT_BOTTOM (w); |
4215 Lisp_Object window; | 4215 Lisp_Object window; |
4216 int defheight, defwidth; | 4216 int defheight, defwidth; |
4217 | 4217 |
4242 if (defheight) | 4242 if (defheight) |
4243 num_lines += ((ypos2 - ypos1) / defheight); | 4243 num_lines += ((ypos2 - ypos1) / defheight); |
4244 } | 4244 } |
4245 else | 4245 else |
4246 { | 4246 { |
4247 if (num_lines > 1 && Dynarr_atp (dla, 0)->modeline) | 4247 if (num_lines > 1 && Dynarr_begin (dla)->modeline) |
4248 num_lines--; | 4248 num_lines--; |
4249 | 4249 |
4250 if (scroll_on_clipped_lines | 4250 if (scroll_on_clipped_lines |
4251 && Dynarr_atp (dla, Dynarr_length (dla) - 1)->clip) | 4251 && Dynarr_atp (dla, Dynarr_length (dla) - 1)->clip) |
4252 num_lines--; | 4252 num_lines--; |
4615 fheight = XINT (Vwindow_pixel_scroll_increment); | 4615 fheight = XINT (Vwindow_pixel_scroll_increment); |
4616 else if (!NILP (Vwindow_pixel_scroll_increment)) | 4616 else if (!NILP (Vwindow_pixel_scroll_increment)) |
4617 default_face_height_and_width (window, &fheight, &fwidth); | 4617 default_face_height_and_width (window, &fheight, &fwidth); |
4618 | 4618 |
4619 if (Dynarr_length (dla) >= 1) | 4619 if (Dynarr_length (dla) >= 1) |
4620 modeline = Dynarr_atp (dla, 0)->modeline; | 4620 modeline = Dynarr_begin (dla)->modeline; |
4621 | 4621 |
4622 dl = Dynarr_atp (dla, modeline); | 4622 dl = Dynarr_atp (dla, modeline); |
4623 | 4623 |
4624 if (value > 0) | 4624 if (value > 0) |
4625 { | 4625 { |
5303 pos = Fwindow_point (window); | 5303 pos = Fwindow_point (window); |
5304 | 5304 |
5305 CHECK_INT (pos); | 5305 CHECK_INT (pos); |
5306 point = XINT (pos); | 5306 point = XINT (pos); |
5307 | 5307 |
5308 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline) | 5308 if (Dynarr_length (dla) && Dynarr_begin (dla)->modeline) |
5309 first_line = 1; | 5309 first_line = 1; |
5310 else | 5310 else |
5311 first_line = 0; | 5311 first_line = 0; |
5312 | 5312 |
5313 for (i = first_line; i < Dynarr_length (dla); i++) | 5313 for (i = first_line; i < Dynarr_length (dla); i++) |