comparison src/faces.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 11daf37dae4d
children 7ac51121843b
comparison
equal deleted inserted replaced
4843:715b15990d0a 4844:91b3d00e717f
1359 /* The face's background pixmap have not yet been frobbed (see comment 1359 /* The face's background pixmap have not yet been frobbed (see comment
1360 in update_face_cachel_data), so we have to do it now */ 1360 in update_face_cachel_data), so we have to do it now */
1361 if (must_finish_frobbing) 1361 if (must_finish_frobbing)
1362 { 1362 {
1363 int default_face = EQ (face, Vdefault_face); 1363 int default_face = EQ (face, Vdefault_face);
1364 struct face_cachel *cachel 1364 struct face_cachel *cachel = Dynarr_lastp (w->face_cachels);
1365 = Dynarr_atp (w->face_cachels, Dynarr_length (w->face_cachels) - 1);
1366 1365
1367 FROB (background_pixmap); 1366 FROB (background_pixmap);
1368 MAYBE_UNFROB_BACKGROUND_PIXMAP; 1367 MAYBE_UNFROB_BACKGROUND_PIXMAP;
1369 } 1368 }
1370 } 1369 }