annotate nt/x11.patch @ 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 15872534500d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
169
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
1 *** X11.def.old Thu Apr 10 07:29:27 1997
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
2 --- X11.def Wed Jul 02 22:20:16 1997
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
3 ***************
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
4 *** 5,15 ****
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
5 VERSION 6.1
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
6 EXPORTS
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
7 _Xdebug_p=_Xdebug CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
8 - _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
9 - _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
10 - _XLockMutex_fn_p=_XLockMutex_fn CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
11 - _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
12 - _Xglobal_lock_p=_Xglobal_lock CONSTANT
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
13 XActivateScreenSaver
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
14 XAddConnectionWatch
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
15 XAddExtension
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
16 --- 5,10 ----
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
17 ***************
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
18 *** 623,630 ****
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
19 _XUnregisterFilter
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
20 _XUnregisterInternalConnection
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
21 _XVIDtoVisual
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
22 - _Xthread_init
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
23 - _Xthread_waiter
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
24 XkbIgnoreExtension
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
25 XkbOpenDisplay
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
26 XkbQueryExtension
15872534500d Import from CVS: tag r20-3b11
cvs
parents:
diff changeset
27 --- 618,623 ----