Mercurial > hg > xemacs-beta
comparison src/device-x.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 | 3461165c79be |
children | cbe181529c34 |
comparison
equal
deleted
inserted
replaced
4966:48b63cd88a21 | 4967:0d4c9d0f6a8d |
---|---|
1426 XtGetApplicationNameAndClass (*display_out, &appname, &appclass); | 1426 XtGetApplicationNameAndClass (*display_out, &appname, &appclass); |
1427 name_len = strlen (appname); | 1427 name_len = strlen (appname); |
1428 class_len = strlen (appclass); | 1428 class_len = strlen (appclass); |
1429 Dynarr_add_many (name, appname, name_len); | 1429 Dynarr_add_many (name, appname, name_len); |
1430 Dynarr_add_many (class_, appclass, class_len); | 1430 Dynarr_add_many (class_, appclass, class_len); |
1431 validify_resource_component (Dynarr_atp (name, 0), name_len); | 1431 validify_resource_component (Dynarr_begin (name), name_len); |
1432 validify_resource_component (Dynarr_atp (class_, 0), class_len); | 1432 validify_resource_component (Dynarr_begin (class_), class_len); |
1433 } | 1433 } |
1434 | 1434 |
1435 if (EQ (locale, Qglobal)) | 1435 if (EQ (locale, Qglobal)) |
1436 return; | 1436 return; |
1437 if (BUFFERP (locale)) | 1437 if (BUFFERP (locale)) |
1569 Dynarr_add (class_Extbyte_dynarr, '.'); | 1569 Dynarr_add (class_Extbyte_dynarr, '.'); |
1570 Dynarr_add_lisp_string (class_Extbyte_dynarr, class_, Qbinary); | 1570 Dynarr_add_lisp_string (class_Extbyte_dynarr, class_, Qbinary); |
1571 Dynarr_add (name_Extbyte_dynarr, '\0'); | 1571 Dynarr_add (name_Extbyte_dynarr, '\0'); |
1572 Dynarr_add (class_Extbyte_dynarr, '\0'); | 1572 Dynarr_add (class_Extbyte_dynarr, '\0'); |
1573 | 1573 |
1574 name_string = Dynarr_atp (name_Extbyte_dynarr, 0); | 1574 name_string = Dynarr_begin (name_Extbyte_dynarr); |
1575 class_string = Dynarr_atp (class_Extbyte_dynarr, 0); | 1575 class_string = Dynarr_begin (class_Extbyte_dynarr); |
1576 | 1576 |
1577 { | 1577 { |
1578 XrmValue xrm_value; | 1578 XrmValue xrm_value; |
1579 XrmName namelist[100]; | 1579 XrmName namelist[100]; |
1580 XrmClass classlist[100]; | 1580 XrmClass classlist[100]; |
1669 x_get_resource_prefix (locale, device, &display, | 1669 x_get_resource_prefix (locale, device, &display, |
1670 name_Extbyte_dynarr, class_Extbyte_dynarr); | 1670 name_Extbyte_dynarr, class_Extbyte_dynarr); |
1671 if (!display) | 1671 if (!display) |
1672 return Qnil; | 1672 return Qnil; |
1673 | 1673 |
1674 return Fcons (make_string ((Ibyte *) Dynarr_atp (name_Extbyte_dynarr, 0), | 1674 return Fcons (make_string ((Ibyte *) Dynarr_begin (name_Extbyte_dynarr), |
1675 Dynarr_length (name_Extbyte_dynarr)), | 1675 Dynarr_length (name_Extbyte_dynarr)), |
1676 make_string ((Ibyte *) Dynarr_atp (class_Extbyte_dynarr, 0), | 1676 make_string ((Ibyte *) Dynarr_begin (class_Extbyte_dynarr), |
1677 Dynarr_length (class_Extbyte_dynarr))); | 1677 Dynarr_length (class_Extbyte_dynarr))); |
1678 } | 1678 } |
1679 | 1679 |
1680 DEFUN ("x-put-resource", Fx_put_resource, 1, 2, 0, /* | 1680 DEFUN ("x-put-resource", Fx_put_resource, 1, 2, 0, /* |
1681 Add a resource to the resource database for DEVICE. | 1681 Add a resource to the resource database for DEVICE. |