comparison src/redisplay-output.c @ 4844:91b3d00e717f

Various cleanups for Dynarr code, from Unicode-internal ws dynarr.c: Add comment explaining Dynarr_largest() use. dynarr.c: In Dynarr_insert_many(), don't call Dynarr_resize() unless we actually need to resize, and note that an assert() that we are inserting at or below the current end could be wrong if code wants to access stuff between `len' and `largest'. dynarr.c: Don't just Dynarr_resize() to the right size; instead use Dynarr_reset() then Dynarr_add_many(), so that the 'len' and 'largest' and such get set properly. dynarr.c, faces.c, gutter.c, lisp.h, lread.c, lrecord.h, redisplay-output.c, redisplay.c: Rename Dynarr member 'cur' to 'len' since it's the length of the dynarr, not really a pointer to a "current insertion point". Use type_checking_assert() instead of just assert() in some places. Add additional assertions (Dynarr_verify*()) to check that we're being given positions within range. Use them in Dynarr_at, Dynarr_atp, etc. New Dynarr_atp_allow_end() for retrieving a pointer to a position that might be the element past the last one. New Dynarr_past_lastp() to retrieve a pointer to the position past the last one, using Dynarr_atp_allow_end(). Change code appropriately to use it. Rename Dynarr_end() to Dynarr_lastp() (pointer to the last element) for clarity, and change code appropriately to use it. Change code appropriately to use Dynarr_begin(). Rewrite Dynarr_add_many(). New version can accept a NULL pointer to mean "reserve space but don't put anything in it". Used by stack_like_malloc().
author Ben Wing <ben@xemacs.org>
date Wed, 13 Jan 2010 04:07:42 -0600
parents 62d532188a28
children 8b63e21b0436
comparison
equal deleted inserted replaced
4843:715b15990d0a 4844:91b3d00e717f
511 511
512 #if 0 512 #if 0
513 block_end = 513 block_end =
514 (!Dynarr_length (ddb->runes) 514 (!Dynarr_length (ddb->runes)
515 ? 0 515 ? 0
516 : (Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->xpos + 516 : (Dynarr_lastp (ddb->runes)->xpos +
517 Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->width)); 517 Dynarr_lastp (ddb->runes)->width));
518 #endif 518 #endif
519 519
520 /* If the new block type is not text and the cursor status is 520 /* If the new block type is not text and the cursor status is
521 changing and it overlaps the position of this block then force a 521 changing and it overlaps the position of this block then force a
522 full redraw of the block in order to make sure that the cursor is 522 full redraw of the block in order to make sure that the cursor is
688 { 688 {
689 cdl = NULL; 689 cdl = NULL;
690 cdba = NULL; 690 cdba = NULL;
691 } 691 }
692 692
693 ddl = Dynarr_atp (ddla, line); /* assert line < Dynarr_length (ddla) */ 693 /* The following will assert line < Dynarr_length (ddla) */
694 ddl = Dynarr_atp (ddla, line);
694 ddba = ddl->display_blocks; 695 ddba = ddl->display_blocks;
695 696
696 if (force_start >= 0 && force_start >= ddl->bounds.left_out) 697 if (force_start >= 0 && force_start >= ddl->bounds.left_out)
697 start_pixpos = force_start; 698 start_pixpos = force_start;
698 else 699 else