annotate tests/gutter-test.el @ 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 8a653fbe5c27
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4781
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
1 ;;; Copyright (C) 1998 Andy Piper
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
2
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
3 ;;; This file is part of XEmacs.
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
4
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
5 ;;; XEmacs is free software; you can redistribute it and/or modify it
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
6 ;;; under the terms of the GNU General Public License as published by
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
7 ;;; the Free Software Foundation; either version 2, or (at your
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
8 ;;; option) any later version.
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
9
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
10 ;;; XEmacs is distributed in the hope that it will be useful, but
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
11 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
12 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
13 ;;; General Public License for more details.
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
14
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
15 ;;; You should have received a copy of the GNU General Public License
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
16 ;;; along with XEmacs; see the file COPYING. If not, write to the Free
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
17 ;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
18 ;;; Boston, MA 02110-1301, USA.
8a653fbe5c27 Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents: 863
diff changeset
19
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
20 (setq str "Hello\nAgain")
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
21 (setq str-ext (make-extent 0 5 str))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
22 (set-extent-begin-glyph
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
23 str-ext
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24 (make-glyph [xpm :file "../etc/xemacs-icon.xpm"]))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
25 (set-extent-property str-ext 'mouse-face 'highlight)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
27 (setq str2 "Hello\n")
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
28 (setq str2-ext (make-extent 0 1 str2))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
29 (set-extent-begin-glyph
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
30 str2-ext
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31 (make-glyph
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 [button :width 5 :height 1
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33 :face modeline-mousable
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
34 :callback (set-specifier bottom-gutter-visible-p '(str2))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
35 :descriptor "ok" :selected t]))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
36
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
37 (set-specifier bottom-gutter-height 'autodetect)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
38 (set-specifier bottom-gutter-border-width 2)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
39
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
40 (set-gutter-element
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
41 bottom-gutter 'str
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
42 (make-glyph
863
42375619fa45 [xemacs-hg @ 2002-06-04 06:03:59 by andyp]
andyp
parents: 442
diff changeset
43 [layout :orientation vertical :margin-width 4
42375619fa45 [xemacs-hg @ 2002-06-04 06:03:59 by andyp]
andyp
parents: 442
diff changeset
44 :vertically-justify center :horizontally-justify left
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
45 :items ([string :data "Fontifying glyphs.c..."]
863
42375619fa45 [xemacs-hg @ 2002-06-04 06:03:59 by andyp]
andyp
parents: 442
diff changeset
46 [layout :orientation horizontal
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
47 :items
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
48 ([progress-gauge :value 0 :pixel-height 24
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
49 :pixel-width 250 :descriptor
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
50 "Progress"]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
51 [button :pixel-height 24
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
52 :descriptor " Stop "
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
53 :callback (quote quit)])])]))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
54
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
55 (set-gutter-element-visible-p bottom-gutter-visible-p 'str t)
863
42375619fa45 [xemacs-hg @ 2002-06-04 06:03:59 by andyp]
andyp
parents: 442
diff changeset
56 (set-gutter-element left-gutter 'str2 str2)
42375619fa45 [xemacs-hg @ 2002-06-04 06:03:59 by andyp]
andyp
parents: 442
diff changeset
57 (set-gutter-element-visible-p left-gutter-visible-p 'str2 t)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
58