From 12fde2dcdfe56cd65b540f571073ba62931a250d Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 13 Feb 2004 23:29:58 +0000 Subject: [PATCH] (struct draw_fringe_bitmap_params): Change member bits from char to short to facilitate wider bitmaps. (struct redisplay_interface): Fix prototype of define_fringe_bitmap member. --- src/ChangeLog | 27 +++++++++++++++++++++++++++ src/dispextern.h | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 564e5a3416..d84d6f5d3a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,30 @@ +2004-02-14 Kim F. Storm + + * dispextern.h (struct draw_fringe_bitmap_params): Change member + bits from char to short to facilitate wider bitmaps. + (struct redisplay_interface): Fix prototype of define_fringe_bitmap + member. + + * fringe.c (struct fringe_bitmap): Change member bits from char to + short to facilitate 16 bits wide bitmaps. Modify all standard + bitmaps accordingly. + (BYTES_PER_BITMAP_ROW, STANDARD_BITMAP_HEIGHT): New macros. + (FRBITS): Use STANDARD_BITMAP_HEIGHT instead of just sizeof. + (draw_fringe_bitmap): Ditto. + (init_fringe_bitmap) [MAC_OS]: Don't bitswap. + (init_fringe_bitmap) [HAVE_X_WINDOWS]: Enhance bitswapping to + handle up to 16 bits wide bitmaps. + (Fdefine_fringe_bitmap): Doc fix. Handle wider bitmaps. + + * macterm.c (mac_draw_bitmap): Handle 16 bits wide bitmaps directly. + (x_draw_fringe_bitmap): Use enhanced mac_draw_bitmap, so we no longer + need to call mac_create_bitmap_from_bitmap_data and mac_free_bitmap. + + * w32term.c (w32_define_fringe_bitmap): Bitmaps are now 16 bits wide, + so it is no longer necessary to expand them here. + + * xterm.c (x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits). + 2004-02-12 Kim F. Storm * window.c (Fwindow_fringes): Doc fix. diff --git a/src/dispextern.h b/src/dispextern.h index ec6750086e..fc27c6e185 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1641,7 +1641,7 @@ extern int face_change_count; struct draw_fringe_bitmap_params { int which; /* enum fringe_bitmap_type */ - unsigned char *bits; + unsigned short *bits; int wd, h, dh; int x, y; int bx, nx, by, ny; @@ -2189,7 +2189,7 @@ struct redisplay_interface struct draw_fringe_bitmap_params *p)); /* Define and destroy fringe bitmap no. WHICH. */ - void (*define_fringe_bitmap) P_ ((int which, unsigned char *bits, + void (*define_fringe_bitmap) P_ ((int which, unsigned short *bits, int h, int wd)); void (*destroy_fringe_bitmap) P_ ((int which)); -- 2.20.1